From 8e2ea2277b77ee154406ada824af454342b6d860 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Fri, 26 May 2017 22:09:24 -0500
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 f636d632c..cc40de870 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit f636d632c5f08faf88d91034ba493020943e2c2f
+Subproject commit cc40de87027fc6668aa054dec8e8ac257aecf9d9
diff --git a/work/CraftBukkit b/work/CraftBukkit
index c7920f430..a479029a8 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit c7920f4302bce2042aa9c5d1d121e488cb88f7f0
+Subproject commit a479029a85221fa6ce31742aee1abbcc1f998289