Merge master into commands-refactor

2015-12-19 18:26:40 +01:00
parent b64b6177fa 268cc03321
commit 3cc35baa5e
42 changed files with 89 additions and 1010 deletions
@@ -11,7 +11,6 @@ import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.task.MessageTask;
 import fr.xephi.authme.task.TimeoutTask;
 import fr.xephi.authme.util.Utils;
-import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.potion.PotionEffect;