From 14ba978fd23d311c760517b1358e5fc874b02813 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thinkofdeath@spigotmc.org>
Date: Tue, 13 May 2014 11:20:11 +0100
Subject: [PATCH] Upstream merge

---
 CraftBukkit | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CraftBukkit b/CraftBukkit
index 43d894348..8f0832a4b 160000
--- a/CraftBukkit
+++ b/CraftBukkit
@@ -1 +1 @@
-Subproject commit 43d894348ecc3dd5246f903d7705692caf127dcb
+Subproject commit 8f0832a4bb4ce623f9303a11a5dbe4207b1610b1