Upstream merge

By: Thinkofdeath <thinkofdeath@spigotmc.org>

CraftBukkit-Patches/0001-POM-Changes.patch

@@ -1,11 +1,11 @@
-From a7344d5de1c9952cf0e2c9e27a3a5f3283289a53 Mon Sep 17 00:00:00 2001
+From ae912a83567434a436fad96553d8f1ff5114db6a Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Tue, 2 Jul 2013 13:07:39 +1000
 Subject: [PATCH] POM Changes
 
 
 diff --git a/pom.xml b/pom.xml
-index b4b7ae0..006d26b 100644
+index b2e2002..c1073e5 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -1,12 +1,12 @@
@@ -17,7 +17,7 @@ index b4b7ae0..006d26b 100644
 +  <groupId>org.spigotmc</groupId>
 +  <artifactId>spigot</artifactId>
    <packaging>jar</packaging>
-   <version>1.7.9-R0.2-SNAPSHOT</version>
+   <version>1.7.9-R0.3-SNAPSHOT</version>
 -  <name>CraftBukkit</name>
 -  <url>http://www.bukkit.org</url>
 +  <name>Spigot</name>