From 7556f6a5569282b7d9ad164e37a9b6ce50e9744d Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Wed, 30 Nov 2016 21:10:14 -0600
Subject: [PATCH] Update upstream B/CB

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

diff --git a/work/Bukkit b/work/Bukkit
index 51d92a748..4a68be0ed 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit 51d92a748dd56496b173885f6c44ad48da230057
+Subproject commit 4a68be0edc7f0f4b8d08d60f9847e75b08ecbaa1
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 6d5a66f00..4d99feddd 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 6d5a66f00fc87ebeb7b6560ed66ca11ccf35f635
+Subproject commit 4d99feddd02b4402a9c6fe9514525e0534a3135d