Upstream merge

By: Thinkofdeath <thethinkofdeath@gmail.com>

Bukkit-Patches/0001-POM-Changes.patch

@@ -1,11 +1,11 @@
-From ecf8a9f407c07efd658bfc06ca1c2628925c66f2 Mon Sep 17 00:00:00 2001
+From 92ffae9c8707c17a643cb877d92f3e0fa9d23bcc Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 2 Jun 2013 10:36:24 +1000
 Subject: [PATCH] POM Changes
 
 
 diff --git a/pom.xml b/pom.xml
-index 6c07c03..efb3262 100644
+index 50f9bae..fb303e2 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -1,43 +1,23 @@
@@ -23,7 +23,7 @@ index 6c07c03..efb3262 100644
 +
 +    <groupId>org.spigotmc</groupId>
 +    <artifactId>spigot-api</artifactId>
-     <version>1.7.2-R0.3-SNAPSHOT</version>
+     <version>1.7.2-R0.4-SNAPSHOT</version>
 -    <name>Bukkit</name>
 -    <url>http://www.bukkit.org</url>
 +    <name>Spigot-API</name>
@@ -65,5 +65,5 @@ index 6c07c03..efb3262 100644
          <plugins>
              <plugin>
 -- 
-1.8.3.2
+1.8.4.msysgit.0