Upstream merge

By: md_5 <md_5@live.com.au>

CraftBukkit-Patches/0024-Netty.patch

@@ -1,11 +1,11 @@
-From 6a0aa29e1762ab96b8f3f1f1957c266925e06fec Mon Sep 17 00:00:00 2001
+From 147b1c393ad343fe4f3449ed7c61ee9430947587 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Tue, 2 Jul 2013 09:06:29 +1000
 Subject: [PATCH] Netty
 
 
 diff --git a/pom.xml b/pom.xml
-index afe0225..8be284c 100644
+index 0e6c422..401dd2d 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -112,6 +112,21 @@
@@ -15,12 +15,12 @@ index afe0225..8be284c 100644
 +    <dependency>
 +      <groupId>io.netty</groupId>
 +      <artifactId>netty-codec</artifactId>
-+      <version>4.0.4.Final</version>
++      <version>4.0.6.Final</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>io.netty</groupId>
 +      <artifactId>netty-handler</artifactId>
-+      <version>4.0.4.Final</version>
++      <version>4.0.6.Final</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.javassist</groupId>
@@ -160,7 +160,7 @@ index c9e187e..b433c60 100644
              this.b = true;
          } catch (Exception exception) {
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index a0d5047..736ba25 100644
+index 8499c7f..e5a09b3 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -6,6 +6,8 @@ import java.io.IOException;