Upstream merge, nothing major.

By: md_5 <git@md-5.net>

CraftBukkit-Patches/0075-Add-VanillaCommand-Wrapper-to-Support-New-Commands.patch

@@ -1,4 +1,4 @@
-From 74545d3df2c4499287022b01b051bb88d953e041 Mon Sep 17 00:00:00 2001
+From b889d097a6084e131b56d547b18d3e2f64d89fd8 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Wed, 18 Dec 2013 10:32:15 +1100
 Subject: [PATCH] Add VanillaCommand Wrapper to Support New Commands
@@ -32,7 +32,7 @@ index e63f17c..e58be15 100644
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index cfa90d3..f369944 100644
+index 5cd6f7d..232a604 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -546,6 +546,12 @@ public final class CraftServer implements Server {
@@ -48,7 +48,7 @@ index cfa90d3..f369944 100644
  
          sender.sendMessage(org.spigotmc.SpigotConfig.unknownCommandMessage);
  
-@@ -1399,15 +1405,23 @@ public final class CraftServer implements Server {
+@@ -1401,15 +1407,23 @@ public final class CraftServer implements Server {
          }
          // Spigot End
  
@@ -310,5 +310,5 @@ index 0000000..a6c76cc
 +    }
 +}
 -- 
-1.8.4.msysgit.0
+1.8.3.2