From e3c9d51e961a82188afd8c979a5a6db479e288f4 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thinkofdeath@spigotmc.org>
Date: Thu, 19 Mar 2015 21:31:59 +0000
Subject: [PATCH] Upstream merge

---
 CraftBukkit-Patches/0056-BungeeCord-Support.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CraftBukkit-Patches/0056-BungeeCord-Support.patch b/CraftBukkit-Patches/0056-BungeeCord-Support.patch
index 06a718393..833947c0b 100644
--- a/CraftBukkit-Patches/0056-BungeeCord-Support.patch
+++ b/CraftBukkit-Patches/0056-BungeeCord-Support.patch
@@ -81,7 +81,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 @@ -0,0 +0,0 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet> {
      private final Queue<NetworkManager.QueuedPacket> i = Queues.newConcurrentLinkedQueue();
      private final ReentrantReadWriteLock j = new ReentrantReadWriteLock();
-     public Channel k; // CraftBukkit - public, PAIL: rename
+     public Channel k; // CraftBukkit - public, PAIL: Rename channel
 -    private SocketAddress l;
 +    // Spigot Start
 +    public SocketAddress l;