From a1e6856f62c682d899cc3f8dd3a07e29b822eb58 Mon Sep 17 00:00:00 2001
From: Jamie Mansfield <dev@jamierocks.uk>
Date: Thu, 1 Dec 2016 16:12:28 +0000
Subject: [PATCH] Merge upstream. Fixes #104

---
 BungeeCord | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/BungeeCord b/BungeeCord
index 4d004d5..ea66802 160000
--- a/BungeeCord
+++ b/BungeeCord
@@ -1 +1 @@
-Subproject commit 4d004d5fed51e6fb8ef9ce6f970d73186371078a
+Subproject commit ea6680281f3b20f4f1dcab44c51b4640c27f357c