Upstream merge

By: md_5 <git@md-5.net>

CraftBukkit-Patches/0123-Add-Conversion-Message.patch

@@ -0,0 +1,21 @@
+From 741919efc9f2593522022bfaa97734fa62e72d8d Mon Sep 17 00:00:00 2001
+From: md_5 <git@md-5.net>
+Date: Sat, 12 Apr 2014 23:30:44 +1000
+Subject: [PATCH] Add Conversion Message
+
+
+diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
+index dc9625b..62d5847 100644
+--- a/src/main/java/net/minecraft/server/DedicatedServer.java
++++ b/src/main/java/net/minecraft/server/DedicatedServer.java
+@@ -414,6 +414,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
+     }
+ 
+     protected boolean aE() {
++        server.getLogger().info( "**** Beginning UUID conversion, this may take A LONG time ****"); // Spigot, let the user know whats up!
+         boolean flag = false;
+ 
+         int i;
+-- 
+1.9.1
+