Upstream merge: 1.7.9

By: Thinkofdeath <thethinkofdeath@gmail.com>

CraftBukkit-Patches/0001-POM-Changes.patch

@@ -1,11 +1,11 @@
-From c21c052e42fcd93deab9697a730ad59a4f874ffa Mon Sep 17 00:00:00 2001
+From d36fbfecfe40509da20f581af79322589ead5414 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 3d4395d..2b14bef 100644
+index 84a00a3..607be4e 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -1,12 +1,20 @@
@@ -25,7 +25,7 @@ index 3d4395d..2b14bef 100644
 +  <groupId>org.spigotmc</groupId>
 +  <artifactId>spigot</artifactId>
    <packaging>jar</packaging>
-   <version>1.7.8-R0.1-SNAPSHOT</version>
+   <version>1.7.9-R0.1-SNAPSHOT</version>
 -  <name>CraftBukkit</name>
 -  <url>http://www.bukkit.org</url>
 +  <name>Spigot</name>
@@ -142,7 +142,7 @@ index 3d4395d..2b14bef 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 e33576d..f3d9979 100644
+index 111abb8..59010eb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -310,7 +310,7 @@ public final class CraftServer implements Server {
@@ -168,5 +168,5 @@ index f905d17..9304637 100644
  
          if (stream != null) {
 -- 
-1.8.3.2
+1.8.5.2.msysgit.0