From 70a5fa4a9b97016d9eda29d23bf273ee82c68d80 Mon Sep 17 00:00:00 2001
From: Zach Brown <1254957+zachbr@users.noreply.github.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 3cfd8ca3cb..5d90f9712b 160000
--- a/CraftBukkit
+++ b/CraftBukkit
@@ -1 +1 @@
-Subproject commit 3cfd8ca3cb0646911445b7942a0951d3fcf26d66
+Subproject commit 5d90f9712bc86faee6015799c07058175c6d8323