Upstream merge: conflict resolution and version bump

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

Bukkit-Patches/0011-Update-Depends.patch

@@ -1,4 +1,4 @@
-From e8da0323d4163ef96b9be72eabe3d5b730834efd Mon Sep 17 00:00:00 2001
+From b1dcd5bfb51249023019a871be0586f76faf18ba 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 fb303e2..5187a99 100644
+index b394a33..4252e34 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -77,21 +77,21 @@
+@@ -76,21 +76,21 @@
          <dependency>
              <groupId>org.yaml</groupId>
              <artifactId>snakeyaml</artifactId>
@@ -34,7 +34,7 @@ index fb303e2..5187a99 100644
              <type>jar</type>
              <scope>compile</scope>
          </dependency>
-@@ -105,7 +105,7 @@
+@@ -104,7 +104,7 @@
          <dependency>
              <groupId>commons-lang</groupId>
              <artifactId>commons-lang</artifactId>
@@ -44,5 +44,5 @@ index fb303e2..5187a99 100644
  
          <!-- testing -->
 -- 
-1.8.3.2
+1.9.1