From a6efcbe9932345bdd11e7f4dab830a582cae2229 Mon Sep 17 00:00:00 2001
From: Zach Brown <Zbob750@live.com>
Date: Sat, 19 Jul 2014 19:31:35 -0500
Subject: [PATCH] Upstream - Update from CraftBukkit

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

diff --git a/Bukkit b/Bukkit
index be54fcbd2b..0cd44c54d0 160000
--- a/Bukkit
+++ b/Bukkit
@@ -1 +1 @@
-Subproject commit be54fcbd2b0da00bd537342ac596893ec41436c7
+Subproject commit 0cd44c54d033b283a256915d14b84fb7730127ba
diff --git a/CraftBukkit b/CraftBukkit
index 6a338af03d..6fb735eefe 160000
--- a/CraftBukkit
+++ b/CraftBukkit
@@ -1 +1 @@
-Subproject commit 6a338af03d9f87f0af55d4bb542110143f719c79
+Subproject commit 6fb735eefe1b6401aff31aec28929f9bacf060cf