From 075650527a9b8e70d6a4164fd16de043bd6404b8 Mon Sep 17 00:00:00 2001
From: Zach Brown <Zbob750@live.com>
Date: Wed, 25 Jun 2014 15:49:03 -0500
Subject: [PATCH] Upstream merge

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

diff --git a/Bukkit b/Bukkit
index 2e15960..567b887 160000
--- a/Bukkit
+++ b/Bukkit
@@ -1 +1 @@
-Subproject commit 2e1596005bbacc9a44b25f84854443d71fca088b
+Subproject commit 567b887d98f5889176b22c077d28e28c8dee2e3d
diff --git a/CraftBukkit b/CraftBukkit
index 1e7f484..2f44766 160000
--- a/CraftBukkit
+++ b/CraftBukkit
@@ -1 +1 @@
-Subproject commit 1e7f48469b37f62db017fe0350e4857e80f1a440
+Subproject commit 2f44766568653f960168574bfc66135ad62b1f1a