Upstream merge

By: md_5 <md_5@live.com.au>

CraftBukkit-Patches/0001-POM-Changes.patch

@@ -1,11 +1,11 @@
-From fd0c4c152a4a3c0d4bc8d5c4471715695c9c6b4b Mon Sep 17 00:00:00 2001
+From f286b76dd6551fc08ca2f1a0a83e3498f2454cd9 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 8139fbf..afe0225 100644
+index a46ecbd..0e6c422 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -1,12 +1,20 @@
@@ -25,7 +25,7 @@ index 8139fbf..afe0225 100644
 +  <groupId>org.spigotmc</groupId>
 +  <artifactId>spigot</artifactId>
    <packaging>jar</packaging>
-   <version>1.6.2-R0.1-SNAPSHOT</version>
+   <version>1.6.2-R0.2-SNAPSHOT</version>
 -  <name>CraftBukkit</name>
 -  <url>http://www.bukkit.org</url>
 +  <name>Spigot</name>
@@ -140,7 +140,7 @@ index 8139fbf..afe0225 100644
            <execution>
              <phase>package</phase>
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 6cb50b7..00326c1 100644
+index df2efe2..d9396f1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -208,7 +208,7 @@ public final class CraftServer implements Server {