From 65a83d19d0c3112ccd3a84a00557f7f49e628b99 Mon Sep 17 00:00:00 2001
From: Zach Brown <Zbob750@live.com>
Date: Mon, 30 Jun 2014 02:56:38 -0500
Subject: [PATCH] Upstream merge

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

diff --git a/Bukkit b/Bukkit
index 67773ec729..a6c79cf257 160000
--- a/Bukkit
+++ b/Bukkit
@@ -1 +1 @@
-Subproject commit 67773ec72913adeee01a0855253c4d6a9110f471
+Subproject commit a6c79cf2573bb27eaa28346e6acfe650eb8e88e2
diff --git a/CraftBukkit b/CraftBukkit
index cf5e605e91..31899f2b95 160000
--- a/CraftBukkit
+++ b/CraftBukkit
@@ -1 +1 @@
-Subproject commit cf5e605e91cb09b2c8f7b92d20a3ade73c698f64
+Subproject commit 31899f2b95b04fd8ea731177e6f41807726096d1