From 980aa63c74f3b34bcff0fdd14d116673995ab623 Mon Sep 17 00:00:00 2001
From: Zach Brown <Zbob750@live.com>
Date: Fri, 27 Jun 2014 12:29:32 -0500
Subject: [PATCH] More upstream merge

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

diff --git a/Bukkit b/Bukkit
index 0cf705d23..8c8f7f0de 160000
--- a/Bukkit
+++ b/Bukkit
@@ -1 +1 @@
-Subproject commit 0cf705d2353163f6510a25bb3393d891be7097a7
+Subproject commit 8c8f7f0ded4e38c5b2895f13f69a726eb8fb8ea6
diff --git a/CraftBukkit b/CraftBukkit
index 7f086636f..fbb30eee3 160000
--- a/CraftBukkit
+++ b/CraftBukkit
@@ -1 +1 @@
-Subproject commit 7f086636ffaef387c7dbe7aca579c3c417981f42
+Subproject commit fbb30eee315655362267a993fcd5283be6bc4340