From 96c935c9da2026dbc3261ace01327deaa9fcca5c Mon Sep 17 00:00:00 2001
From: Zach Brown <Zbob750@live.com>
Date: Thu, 3 Jul 2014 18:34:59 -0500
Subject: [PATCH] Update from upstream

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

diff --git a/Bukkit b/Bukkit
index 1c334cb37a..5a55230151 160000
--- a/Bukkit
+++ b/Bukkit
@@ -1 +1 @@
-Subproject commit 1c334cb37a38b2e969fa0b61d0e398e35c57ea80
+Subproject commit 5a5523015148a832f110f0e48ca71bce796edd29
diff --git a/CraftBukkit b/CraftBukkit
index 9f56ab1908..32f89aac85 160000
--- a/CraftBukkit
+++ b/CraftBukkit
@@ -1 +1 @@
-Subproject commit 9f56ab1908a0238166c1a35c811758eca677aa70
+Subproject commit 32f89aac85821cc2928d3552bb12bc64ec76b14f