Merge some stuff from upstream.

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

CraftBukkit-Patches/0060-BungeeCord-Support.patch

@@ -1,4 +1,4 @@
-From 2498f80d97f1bc9ee50875dc0f9d496c6eb161ce Mon Sep 17 00:00:00 2001
+From e22e6ecb8c26223ad7a763ddfe1c7f7882092397 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 1 Dec 2013 18:18:41 +1100
 Subject: [PATCH] BungeeCord Support
@@ -98,10 +98,10 @@ index 385dc0a..0d6ffef 100644
          if (this.banByName.isBanned(gameprofile.getName())) {
              BanEntry banentry = (BanEntry) this.banByName.getEntries().get(gameprofile.getName());
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 48be84e..8b6e210 100644
+index b96c27a..10a91fa 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1259,6 +1259,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1260,6 +1260,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      {
  
          @Override
@@ -134,5 +134,5 @@ index 2ea1be7..08bd5ba 100644
 +    }
  }
 -- 
-1.8.5.2.msysgit.0
+1.8.3.2