Upstream merge

By: Thinkofdeath <thethinkofdeath@gmail.com>

Bukkit-Patches/0002-Measure-Timings-Duration.patch

@@ -1,4 +1,4 @@
-From 9e3fffd5a97e355ca42d86c9ef445efe2b58516f Mon Sep 17 00:00:00 2001
+From 2674d1cc80c1aba22c182561dd5da0b048a33b7c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 2 Jun 2013 10:42:57 +1000
 Subject: [PATCH] Measure Timings Duration
@@ -37,10 +37,10 @@ index 05cfcb0..c2874f1 100644
                  if (separate) sender.sendMessage("Names written to " + names.getPath());
              } catch (IOException e) {
 diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-index 3c9611b..2c4b03b 100644
+index 787dcfe..b870ecd 100644
 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-@@ -275,6 +275,7 @@ public final class SimplePluginManager implements PluginManager {
+@@ -280,6 +280,7 @@ public final class SimplePluginManager implements PluginManager {
              }
          }
  
@@ -49,5 +49,5 @@ index 3c9611b..2c4b03b 100644
      }
  
 -- 
-1.8.3.2
+1.8.4.msysgit.0