From 594fd61d173c82be13e7ffde85118d95a4b90847 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 1 May 2016 15:58:10 -0400
Subject: [PATCH] update upstream

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

diff --git a/work/CraftBukkit b/work/CraftBukkit
index 935f18b476..ed60c01794 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 935f18b476b31523b8f01560ada487ec1bea6b3c
+Subproject commit ed60c01794282696e4cf1ae0d7c51cb49306bd55