From aa6a32444562cd6f5e8e42ed6066434fe2fecb6f Mon Sep 17 00:00:00 2001
From: Zach Brown <1254957+zachbr@users.noreply.github.com>
Date: Tue, 1 Jul 2014 21:22:52 -0500
Subject: [PATCH] Upstream merge 2: Upstream merge harder

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

diff --git a/Bukkit b/Bukkit
index 0d0ecc424cf..165f5a89291 160000
--- a/Bukkit
+++ b/Bukkit
@@ -1 +1 @@
-Subproject commit 0d0ecc424cf474d6cd8600d14734a19a061b1b9a
+Subproject commit 165f5a89291d983f1bba79b1e5cf5d757e438f5d
diff --git a/CraftBukkit b/CraftBukkit
index 66d9fc52bba..5b8d0b7cbc8 160000
--- a/CraftBukkit
+++ b/CraftBukkit
@@ -1 +1 @@
-Subproject commit 66d9fc52bba3507cb702f5736f3e9af03e8579b1
+Subproject commit 5b8d0b7cbc8cb93dfe3b03c57fdb238455b615aa