From 4811f5cbf96130c736685c63974234df4340bca2 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Mon, 7 Mar 2016 15:37:29 -0600
Subject: [PATCH] Upstream merge

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

diff --git a/CraftBukkit b/CraftBukkit
index 20d9f644a6..bf43ca62a6 160000
--- a/CraftBukkit
+++ b/CraftBukkit
@@ -1 +1 @@
-Subproject commit 20d9f644a67443905e28d4df4c25f9a4fe0d32c1
+Subproject commit bf43ca62a65800d1c1ced66d2e018eea28058bf0