Upstream merge: 1.7.9

By: Thinkofdeath <thethinkofdeath@gmail.com>

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

@@ -1,14 +1,14 @@
-From b54f2ca74f3ad0197f6e6752fa77331f692a1b01 Mon Sep 17 00:00:00 2001
+From aa2ab38ef8d7f09799c720331bc3d0daf0495848 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 875f25f..2331d6a 100644
+index f66f764..53be9ae 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1600,6 +1600,13 @@ public final class CraftServer implements Server {
+@@ -1598,6 +1598,13 @@ public final class CraftServer implements Server {
      }
  
      public List<String> tabCompleteCommand(Player player, String message) {
@@ -49,5 +49,5 @@ index afd6b56..20634f1 100644
 +    }
  }
 -- 
-1.8.3.2
+1.8.5.2.msysgit.0