Upstream merge

By: Thinkofdeath <thethinkofdeath@gmail.com>

Bukkit-Patches/0015-Player-Collision-API.patch

@@ -1,14 +1,14 @@
-From 240fc02a1e8cc6aa73258b81e2721b03328ad450 Mon Sep 17 00:00:00 2001
+From 07f1e37031ec86f69acce0c4c66deb0d1a978473 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 3 Aug 2013 19:20:50 +1000
 Subject: [PATCH] Player Collision API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index a2ac7a6..55681ff 100644
+index c6bb787..b879ecb 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1038,6 +1038,27 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -1055,6 +1055,27 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
          {
              throw new UnsupportedOperationException( "Not supported yet." );
          }
@@ -37,5 +37,5 @@ index a2ac7a6..55681ff 100644
  
      Spigot spigot();
 -- 
-1.8.3.2
+1.8.5.2.msysgit.0