From fb0ab299be23f68cf0331dbc5622025a8055f60b Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Sun, 17 Apr 2016 13:36:39 -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 85107d1f3..2a1d9d603 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit 85107d1f3d607cd2a38926f3abaae7d6f376eead
+Subproject commit 2a1d9d6033c8d4734dc38b8f7d42e3a7101c354a
diff --git a/work/CraftBukkit b/work/CraftBukkit
index f6313791d..b70058afa 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit f6313791d0f8575e4a3a35c11145f794b8acedd4
+Subproject commit b70058afa240034895eb061b123643a708a53480