Upstream merge

By: Thinkofdeath <thethinkofdeath@gmail.com>

CraftBukkit-Patches/0035-Allow-Disabling-of-Command-Logging.patch

@@ -1,14 +1,14 @@
-From 0a8589407c0e09791756ec92ddc0d6cb81084a9a Mon Sep 17 00:00:00 2001
+From f05c8b683f86064c210af98667e2450558c768cd Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Fri, 21 Jun 2013 18:01:29 +1000
 Subject: [PATCH] Allow Disabling of Command Logging
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index d0ea17a..31be464 100644
+index 333a23f..b281201 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -930,7 +930,12 @@ public class PlayerConnection implements PacketPlayInListener {
+@@ -950,7 +950,12 @@ public class PlayerConnection implements PacketPlayInListener {
          }
  
          try {
@@ -38,5 +38,5 @@ index 9aaa09a..4d15f8b 100644
 +    }
  }
 -- 
-1.8.3.2
+1.8.4.msysgit.0