Upstream merge

By: Thinkofdeath <thethinkofdeath@gmail.com>

Bukkit-Patches/0022-Implement-Locale-Getter-for-Players.patch

@@ -1,14 +1,14 @@
-From 2994d06fa87fd2535a7b464b7a041e2c5c8e9dab Mon Sep 17 00:00:00 2001
+From 57dfad3a6d1085ebc7006402c196285e10e27d6f Mon Sep 17 00:00:00 2001
 From: Smove <jan@lavasurvival.net>
 Date: Sat, 1 Feb 2014 18:10:49 +1100
 Subject: [PATCH] Implement Locale Getter for Players
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 5a8c13e..204c4b2 100644
+index 6559243..2cc19a7 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1067,6 +1067,16 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -1084,6 +1084,16 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
          {
              throw new UnsupportedOperationException( "Not supported yet." );
          }
@@ -26,5 +26,5 @@ index 5a8c13e..204c4b2 100644
  
      Spigot spigot();
 -- 
-1.8.3.2
+1.8.5.2.msysgit.0