Upstream Merge

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

Bukkit-Patches/0011-Update-Depends.patch

@@ -1,4 +1,4 @@
-From 69feff718e80cd27a3bcc2f44f11e3f95c271631 Mon Sep 17 00:00:00 2001
+From 512a9d53929c21762f9a94683a8fb944288f6197 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Thu, 4 Jul 2013 20:05:19 +1000
 Subject: [PATCH] Update Depends
@@ -6,10 +6,10 @@ Subject: [PATCH] Update Depends
 - All of these changes have been reviewed to be binary compatible and in general contract compatible with previous versions of the libraries.
 
 diff --git a/pom.xml b/pom.xml
-index 2b1abbb..14833af 100644
+index 3dae8d4..a5b048e 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -78,21 +78,21 @@
+@@ -77,21 +77,21 @@
          <dependency>
              <groupId>org.yaml</groupId>
              <artifactId>snakeyaml</artifactId>
@@ -34,7 +34,7 @@ index 2b1abbb..14833af 100644
              <type>jar</type>
              <scope>compile</scope>
          </dependency>
-@@ -106,7 +106,7 @@
+@@ -105,7 +105,7 @@
          <dependency>
              <groupId>commons-lang</groupId>
              <artifactId>commons-lang</artifactId>
@@ -44,5 +44,5 @@ index 2b1abbb..14833af 100644
  
          <!-- testing -->
 -- 
-1.8.1.2
+1.8.3.2