From 759a82b8f5a2df255d8b5be9af9ba25897143f94 Mon Sep 17 00:00:00 2001
From: Zach Brown <Zbob750@live.com>
Date: Sun, 29 Jun 2014 13:16:47 -0500
Subject: [PATCH] Upstream merge

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

diff --git a/Bukkit b/Bukkit
index 8c8f7f0de..67773ec72 160000
--- a/Bukkit
+++ b/Bukkit
@@ -1 +1 @@
-Subproject commit 8c8f7f0ded4e38c5b2895f13f69a726eb8fb8ea6
+Subproject commit 67773ec72913adeee01a0855253c4d6a9110f471
diff --git a/CraftBukkit b/CraftBukkit
index fbb30eee3..cf5e605e9 160000
--- a/CraftBukkit
+++ b/CraftBukkit
@@ -1 +1 @@
-Subproject commit fbb30eee315655362267a993fcd5283be6bc4340
+Subproject commit cf5e605e91cb09b2c8f7b92d20a3ade73c698f64