ljacqu d871939793 Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded into commands-refactor ...

Conflicts:
	src/main/java/fr/xephi/authme/command/CommandUtils.java
	src/main/java/fr/xephi/authme/command/executable/captcha/CaptchaCommand.java

2015-12-17 22:32:26 +01:00

..

xephi/authme

Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded into commands-refactor

2015-12-17 22:32:26 +01:00