From ec7bb38953f307aa88259e56ab93f4d160886fa0 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Tue, 26 Jan 2016 00:04:43 -0600
Subject: [PATCH] Add upstreamMerge.sh and update CB submodule

---
 CraftBukkit      |  2 +-
 upstreamMerge.sh | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100755 upstreamMerge.sh

diff --git a/CraftBukkit b/CraftBukkit
index a66b96584..75593ab62 160000
--- a/CraftBukkit
+++ b/CraftBukkit
@@ -1 +1 @@
-Subproject commit a66b96584771093d7199eff150161b83384b7056
+Subproject commit 75593ab621f26c3954bff13057d2ed6720da7592
diff --git a/upstreamMerge.sh b/upstreamMerge.sh
new file mode 100755
index 000000000..7da28daf0
--- /dev/null
+++ b/upstreamMerge.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+PS1="$"
+basedir=`pwd`
+
+function update {
+    cd "$basedir/$1"
+    git fetch && git reset --hard origin/master
+    cd ../
+    git add $1
+}
+
+update Bukkit
+update CraftBukkit
+