From 55fe08d4b939984df8b42fc645017650a616ab4d Mon Sep 17 00:00:00 2001
From: Zach Brown <1254957+zachbr@users.noreply.github.com>
Date: Sun, 12 Jun 2016 12:00:07 -0500
Subject: [PATCH] Update upstream CB/S

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

diff --git a/work/CraftBukkit b/work/CraftBukkit
index ac58f3840e..7f1a32252b 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit ac58f3840ebe6060511c56ca8c4440916ea46425
+Subproject commit 7f1a32252b4fc48bad17ab3e1fc0399ce451f15e
diff --git a/work/Spigot b/work/Spigot
index 6016ac773a..3ccadba36a 160000
--- a/work/Spigot
+++ b/work/Spigot
@@ -1 +1 @@
-Subproject commit 6016ac773a4f7bb51b82cdc0e8c87a6a8b164ceb
+Subproject commit 3ccadba36a71e973ca556ee22bc9e147bacbda12