From d9853fab8ec215bacf09595edd55a5f585202701 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Tue, 8 Mar 2016 18:20:45 -0600
Subject: [PATCH] Upstream merge

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

diff --git a/CraftBukkit b/CraftBukkit
index 3cfd8ca3c..5d90f9712 160000
--- a/CraftBukkit
+++ b/CraftBukkit
@@ -1 +1 @@
-Subproject commit 3cfd8ca3cb0646911445b7942a0951d3fcf26d66
+Subproject commit 5d90f9712bc86faee6015799c07058175c6d8323