Update master to R2 as well.

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

CraftBukkit-Patches/0001-POM-Changes.patch

@@ -1,11 +1,11 @@
-From d126a83bee19a7cad37ba569b9df9e4dc55f5f71 Mon Sep 17 00:00:00 2001
+From 1e30afdf5e51ea4aab45e4ddadaa8e38e4082682 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 56b9e37..e165937 100644
+index b56b26c..de6eeed 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -1,12 +1,20 @@
@@ -25,7 +25,7 @@ index 56b9e37..e165937 100644
 +  <groupId>org.spigotmc</groupId>
 +  <artifactId>spigot</artifactId>
    <packaging>jar</packaging>
-   <version>1.6.4-R1.1-SNAPSHOT</version>
+   <version>1.6.4-R2.1-SNAPSHOT</version>
 -  <name>CraftBukkit</name>
 -  <url>http://www.bukkit.org</url>
 +  <name>Spigot</name>
@@ -142,7 +142,7 @@ index 56b9e37..e165937 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 85be77e..cee0549 100644
+index d140c4f..8fc8bba 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -210,7 +210,7 @@ public final class CraftServer implements Server {