Upstream merge

By: Thinkofdeath <thinkofdeath@spigotmc.org>

Bukkit-Patches/0001-POM-Changes.patch

@@ -1,11 +1,11 @@
-From 08a077bcb805a326ab9197a5814d2a9a54762c90 Mon Sep 17 00:00:00 2001
+From 34f763cc0aea978efc5e76c9c3df06df012bafa1 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 23b7cc3..b394a33 100644
+index dcf7ed3..f7d100a 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -1,42 +1,21 @@
@@ -15,7 +15,7 @@ index 23b7cc3..b394a33 100644
 -    <artifactId>bukkit</artifactId>
 +    <groupId>org.spigotmc</groupId>
 +    <artifactId>spigot-api</artifactId>
-     <version>1.7.9-R0.2-SNAPSHOT</version>
+     <version>1.7.9-R0.3-SNAPSHOT</version>
 -    <name>Bukkit</name>
 -    <url>http://www.bukkit.org</url>
 +    <name>Spigot-API</name>