Upstream merge

By: Thinkofdeath <thethinkofdeath@gmail.com>

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

@@ -1,14 +1,14 @@
-From a5df96e3cb33d275fa20fb9b1a515718e249e78f Mon Sep 17 00:00:00 2001
+From 47b68c9e9aedc25df26b5e225026027de32075a2 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 b60ca66..4f03183 100644
+index 1792828..141de1e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1400,6 +1400,13 @@ public final class CraftServer implements Server {
+@@ -1399,6 +1399,13 @@ public final class CraftServer implements Server {
      }
  
      public List<String> tabCompleteCommand(Player player, String message) {
@@ -38,5 +38,5 @@ index 4d15f8b..8764045 100644
 +    }
  }
 -- 
-1.8.3.2
+1.8.4.msysgit.0