From 0a015800118d1f23b829329ec21cad98fefa4b12 Mon Sep 17 00:00:00 2001
From: Zach Brown <1254957+zachbr@users.noreply.github.com>
Date: Thu, 31 Mar 2016 12:58:20 -0500
Subject: [PATCH] Upstream merge CB, rebuild patch

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

diff --git a/CraftBukkit b/CraftBukkit
index 8b61cc520..6247aa00c 160000
--- a/CraftBukkit
+++ b/CraftBukkit
@@ -1 +1 @@
-Subproject commit 8b61cc52088ccb9220970740a4905baf3781a680
+Subproject commit 6247aa00cc50cff563dc17811db1c3f4a9f1487c