From a7d4bd3735146f12de887f3b56bdbef5bfd3c6e8 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Mon, 29 May 2017 16:11:54 -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 b673e1570036..c62b9cd3e2ca 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit b673e1570036bac636c01c11a8526867f23af45c
+Subproject commit c62b9cd3e2ca0b73957eac0696447c79b6fe389f
diff --git a/work/CraftBukkit b/work/CraftBukkit
index c037fe3d4427..c155d8dd3255 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit c037fe3d442702885d9c6bfa65621fb624210c02
+Subproject commit c155d8dd32556a197ab73c437760e6194ae4e04a