From 986af4b11dc7e92e7d15e0097fce618021af87b9 Mon Sep 17 00:00:00 2001
From: Zach Brown <1254957+zachbr@users.noreply.github.com>
Date: Sat, 26 Mar 2016 01:38:02 -0500
Subject: [PATCH] Update upstream CB/Spigot cc GH-146

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

diff --git a/CraftBukkit b/CraftBukkit
index 9554894553..6bf25cde7e 160000
--- a/CraftBukkit
+++ b/CraftBukkit
@@ -1 +1 @@
-Subproject commit 95548945533d8572a7cb911b33c8ef4a823be49b
+Subproject commit 6bf25cde7ecbaeb89bdfe18e7971669cec668646
diff --git a/Spigot b/Spigot
index 5d4e372f48..129f87a2c0 160000
--- a/Spigot
+++ b/Spigot
@@ -1 +1 @@
-Subproject commit 5d4e372f482b9291a1255c62a6b02c754b66d5f8
+Subproject commit 129f87a2c0ca73bea240b952d62e98ec59a1dc66