Update from upstream SpigotMC

3beb7729816 a77ed5758a7 52c130fc6d9
2014-12-20 19:09:49 -06:00
parent 73bc2489c0
commit a9b3e95f53
7 changed files with 19 additions and 11 deletions
--- a/CraftBukkit-Patches/0001-POM-Changes.patch
+++ b/CraftBukkit-Patches/0001-POM-Changes.patch
@@ -120,6 +120,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
         Properties properties = new Properties();
 
         if (stream != null) {
-- 
-1.9.4.msysgit.2
-
+--