Upstream merge

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

CraftBukkit-Patches/0029-BungeeCord-Support.patch

@@ -1,4 +1,4 @@
-From a00b57c3f0b5e97e36616d767febdcb7011a064f Mon Sep 17 00:00:00 2001
+From 79f9e280ee27db93df6aa9911cd3fa09f9e93c0b Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 23 Mar 2013 11:15:11 +1100
 Subject: [PATCH] BungeeCord Support
@@ -6,10 +6,10 @@ Subject: [PATCH] BungeeCord Support
 - Allows BungeeCord to set the players real IP address very early in the login process, so that the BungeeCord proxy IP is never even seen by a plugin.
 
 diff --git a/src/main/java/net/minecraft/server/PendingConnection.java b/src/main/java/net/minecraft/server/PendingConnection.java
-index f48d4a9..9080831 100644
+index 6ffc927..8f1c214 100644
 --- a/src/main/java/net/minecraft/server/PendingConnection.java
 +++ b/src/main/java/net/minecraft/server/PendingConnection.java
-@@ -235,4 +235,17 @@ public class PendingConnection extends Connection {
+@@ -236,4 +236,17 @@ public class PendingConnection extends Connection {
      static boolean a(PendingConnection pendingconnection, boolean flag) {
          return pendingconnection.h = flag;
      }