From f26cff016e412c739531792bd91b2671fe27973b Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Tue, 15 Mar 2016 22:37:52 -0500
Subject: [PATCH] Update upstream B/CB

---
 Bukkit      | 2 +-
 CraftBukkit | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Bukkit b/Bukkit
index 37a1591a7..6e846a551 160000
--- a/Bukkit
+++ b/Bukkit
@@ -1 +1 @@
-Subproject commit 37a1591a7b3dc99897da89c2377fd69777b99dcd
+Subproject commit 6e846a5517443fddf08133186e439f4c121b2386
diff --git a/CraftBukkit b/CraftBukkit
index 00d333414..8b69bdd0d 160000
--- a/CraftBukkit
+++ b/CraftBukkit
@@ -1 +1 @@
-Subproject commit 00d333414afbff4f646867631970c52065e161cb
+Subproject commit 8b69bdd0d1c4a6f6cfc32e60e30751f5f6440ce7