From 74f49aecf4ed1f2b64363022bda3252152f6ec59 Mon Sep 17 00:00:00 2001
From: Zach Brown <Zbob750@live.com>
Date: Sat, 5 Jul 2014 14:40:16 -0500
Subject: [PATCH] Upstream merge

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

diff --git a/Bukkit b/Bukkit
index 194fc99e4..4d4ccf651 160000
--- a/Bukkit
+++ b/Bukkit
@@ -1 +1 @@
-Subproject commit 194fc99e42c576550edb59ea932e94105a96d033
+Subproject commit 4d4ccf65159ebc895698abc9f282c394d7f159d5
diff --git a/CraftBukkit b/CraftBukkit
index 4ab7d2a46..cb4dee587 160000
--- a/CraftBukkit
+++ b/CraftBukkit
@@ -1 +1 @@
-Subproject commit 4ab7d2a464a96dbbed64e3bbcb00d498c7bf7678
+Subproject commit cb4dee587d3563de711fb2b3362796db43361763