Update to 1.5.1

By: Benjamin James Harrison-Sims <tehrainbowguy@gmail.com>

CraftBukkit-Patches/0004-Update-item-merge-logic.patch

@@ -1,4 +1,4 @@
-From 2e93b88a60c6455d3c3754c75c788cc705e5b7b3 Mon Sep 17 00:00:00 2001
+From fb269cb8e23a35d6356ea849600768b7d137adbd Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@bigpond.com>
 Date: Sun, 23 Dec 2012 17:51:07 +1100
 Subject: [PATCH] Update item merge logic
@@ -8,7 +8,7 @@ Subject: [PATCH] Update item merge logic
  1 file changed, 7 insertions(+), 8 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 14df580..d1fe36f 100644
+index 134ab73..d78d948 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -948,6 +948,7 @@ public abstract class World implements IBlockAccess {
@@ -41,5 +41,5 @@ index 14df580..d1fe36f 100644
                              }
                          }
 -- 
-1.8.1-rc2
+1.8.2