From 3acf9df3be9f6013b238d55abdee049523fb1ad6 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Sat, 19 Mar 2016 21:42:04 -0500
Subject: [PATCH] Merge latest upstream CB

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

diff --git a/CraftBukkit b/CraftBukkit
index b3f6de0da..6cac62c64 160000
--- a/CraftBukkit
+++ b/CraftBukkit
@@ -1 +1 @@
-Subproject commit b3f6de0da51ba476bb6792f6fdf44cec472d3cce
+Subproject commit 6cac62c64d8f851e0ed7c4c989cfe21cc46e7050