From b4af9c904c76b9f7b853c37f412b985587e37af4 Mon Sep 17 00:00:00 2001
From: Zach Brown <Zbob750@live.com>
Date: Wed, 2 Jul 2014 22:58:32 -0500
Subject: [PATCH] Update from upstream

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

diff --git a/Bukkit b/Bukkit
index 165f5a8929..1c334cb37a 160000
--- a/Bukkit
+++ b/Bukkit
@@ -1 +1 @@
-Subproject commit 165f5a89291d983f1bba79b1e5cf5d757e438f5d
+Subproject commit 1c334cb37a38b2e969fa0b61d0e398e35c57ea80
diff --git a/CraftBukkit b/CraftBukkit
index 5b8d0b7cbc..9f56ab1908 160000
--- a/CraftBukkit
+++ b/CraftBukkit
@@ -1 +1 @@
-Subproject commit 5b8d0b7cbc8cb93dfe3b03c57fdb238455b615aa
+Subproject commit 9f56ab1908a0238166c1a35c811758eca677aa70