From c18e7a5097c08a3129c8bca1f6ac3623e23142f2 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Fri, 2 Aug 2013 17:05:05 +1000
Subject: [PATCH] Upstream merge

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

diff --git a/Bukkit b/Bukkit
index 08c71f2..dd0aa63 160000
--- a/Bukkit
+++ b/Bukkit
@@ -1 +1 @@
-Subproject commit 08c71f24abc214bb6995a7266593dbb2217ddde1
+Subproject commit dd0aa63021567282617f39134b5294523666eb83
diff --git a/CraftBukkit b/CraftBukkit
index 4176258..64d45a2 160000
--- a/CraftBukkit
+++ b/CraftBukkit
@@ -1 +1 @@
-Subproject commit 4176258a836062b22ac46919aefa5cc36fae78f2
+Subproject commit 64d45a2fddf6c0c27b52f4badae057c81c55f720