From daab2c8a77232c810aa368b910b991c0a4e3dc5f Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Tue, 5 Apr 2016 11:42:40 -0500
Subject: [PATCH] Upstream merge

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

diff --git a/work/CraftBukkit b/work/CraftBukkit
index f326992b8..3dc138d98 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit f326992b8b4df295dc35b06e8c3701c7b4397c9b
+Subproject commit 3dc138d98059b6841694d75615a9efadb4a65732