From 7daa2e11b960cbcd8eebc1abdb232059cef87928 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 22 Jun 2017 23:14:20 -0400
Subject: [PATCH] Update upstream

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

diff --git a/work/Bukkit b/work/Bukkit
index 6751b88aa..f068554c9 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit 6751b88aad40d75795e4111e894d815381688730
+Subproject commit f068554c9d1051d21457b943fc6c96b3682d7ca4
diff --git a/work/CraftBukkit b/work/CraftBukkit
index f3356f107..1314229dc 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit f3356f107465e2b74d353dce8f6daa49231dcc15
+Subproject commit 1314229dc26eed23606f209b7fe7eaf2fd08a10f