Upstream merge.

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

Bukkit-Patches/0011-Update-Depends.patch

@@ -1,4 +1,4 @@
-From 7d30d01ca1ae5c7c6fcf81396ad4919360c4e81c Mon Sep 17 00:00:00 2001
+From 69feff718e80cd27a3bcc2f44f11e3f95c271631 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 95d042b..b011de6 100644
+index 2b1abbb..14833af 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -77,21 +77,21 @@
+@@ -78,21 +78,21 @@
          <dependency>
              <groupId>org.yaml</groupId>
              <artifactId>snakeyaml</artifactId>
@@ -34,7 +34,7 @@ index 95d042b..b011de6 100644
              <type>jar</type>
              <scope>compile</scope>
          </dependency>
-@@ -105,7 +105,7 @@
+@@ -106,7 +106,7 @@
          <dependency>
              <groupId>commons-lang</groupId>
              <artifactId>commons-lang</artifactId>