Upstream merge: 1.7.9

By: Thinkofdeath <thethinkofdeath@gmail.com>

CraftBukkit-Patches/0139-Fix-ban-expire-dates.patch

@@ -0,0 +1,22 @@
+From b2bad76db2be7ed3a017f21d65ca80010b08090b Mon Sep 17 00:00:00 2001
+From: md_5 <git@md-5.net>
+Date: Wed, 16 Apr 2014 10:09:56 +1000
+Subject: [PATCH] Fix ban expire dates.
+
+
+diff --git a/src/main/java/net/minecraft/server/GameProfileBanEntry.java b/src/main/java/net/minecraft/server/GameProfileBanEntry.java
+index 3738b3e..4e8ffd4 100644
+--- a/src/main/java/net/minecraft/server/GameProfileBanEntry.java
++++ b/src/main/java/net/minecraft/server/GameProfileBanEntry.java
+@@ -13,7 +13,7 @@ public class GameProfileBanEntry extends ExpirableListEntry {
+     }
+ 
+     public GameProfileBanEntry(GameProfile gameprofile, Date date, String s, Date date1, String s1) {
+-        super(gameprofile, date1, s, date1, s1);
++        super(gameprofile, date, s, date1, s1); // Spigot
+     }
+ 
+     public GameProfileBanEntry(JsonObject jsonobject) {
+-- 
+1.8.5.2.msysgit.0
+