Upstream merge

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

CraftBukkit-Patches/0001-POM-Changes.patch

@@ -1,11 +1,11 @@
-From 1e89a50213c51e7ee007a928876031c590a84e59 Mon Sep 17 00:00:00 2001
+From 1c3e7c82ffcf88db8257648b299b791ad87a697b 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 2afdff4..fb6b5c4 100644
+index f81e47a..a4051a1 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -1,12 +1,20 @@
@@ -25,7 +25,7 @@ index 2afdff4..fb6b5c4 100644
 +  <groupId>org.spigotmc</groupId>
 +  <artifactId>spigot</artifactId>
    <packaging>jar</packaging>
-   <version>1.7.2-R0.1-SNAPSHOT</version>
+   <version>1.7.2-R0.2-SNAPSHOT</version>
 -  <name>CraftBukkit</name>
 -  <url>http://www.bukkit.org</url>
 +  <name>Spigot</name>