From 04e241d47227b1e0cf3c186a92428c6f7749f3c5 Mon Sep 17 00:00:00 2001
From: Jamie Mansfield <dev@jamierocks.uk>
Date: Tue, 15 Nov 2016 22:45:30 +0000
Subject: [PATCH] Merge upstream

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

diff --git a/BungeeCord b/BungeeCord
index f3e5f34..8574688 160000
--- a/BungeeCord
+++ b/BungeeCord
@@ -1 +1 @@
-Subproject commit f3e5f34aebc23f07d9605e177ed33c6c2d0af1f7
+Subproject commit 8574688be7512040fa2c75e101ee6f17e5444e6b