Upstream Merge

By: md_5 <md_5@live.com.au>

CraftBukkit-Patches/0047-Allow-Disabling-of-Command-TabComplete.patch

@@ -1,14 +1,14 @@
-From 249bf6de8ad4cb9037433ba6a12028857243a994 Mon Sep 17 00:00:00 2001
+From 7bf7fbec6b559c4418506b2694c2bcb1102105f2 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Fri, 21 Jun 2013 18:05:54 +1000
 Subject: [PATCH] Allow Disabling of Command TabComplete
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index c127f2a..0fa69ea 100644
+index a1fdc79..0d7b044 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1365,7 +1365,7 @@ public final class CraftServer implements Server {
+@@ -1372,7 +1372,7 @@ public final class CraftServer implements Server {
      public List<String> tabCompleteCommand(Player player, String message) {
          List<String> completions = null;
          try {
@@ -33,5 +33,5 @@ index babedc0..e146926 100644
 +    }
  }
 -- 
-1.8.1.2
+1.8.3.2