From 5af342537d845f0904097683e0776f62007a11f8 Mon Sep 17 00:00:00 2001
From: Zach Brown <1254957+zachbr@users.noreply.github.com>
Date: Sat, 19 Jul 2014 14:38:01 -0500
Subject: [PATCH] Upstream - Prevent attribute and NBT client crashes, dont
 spawn bonus ocelots when spawned via plugin

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

diff --git a/Bukkit b/Bukkit
index 6aaa24c17..7aeb9ceba 160000
--- a/Bukkit
+++ b/Bukkit
@@ -1 +1 @@
-Subproject commit 6aaa24c170104c13cca78283edf287e6dcd29a17
+Subproject commit 7aeb9ceba2a37b40ef27f64be53ac34a56401d31
diff --git a/CraftBukkit b/CraftBukkit
index 1e6afbefd..cc54ec2f8 160000
--- a/CraftBukkit
+++ b/CraftBukkit
@@ -1 +1 @@
-Subproject commit 1e6afbefdbe34e84cbc213fdb8381e63c362765d
+Subproject commit cc54ec2f88ee2f255a108cca1e09d2ef1fabd13e