Gabriele C e60a5190f9 Fix conflict ...

Conflicts:
	src/main/java/fr/xephi/authme/AuthMe.java

2015-11-01 23:37:12 +01:00

..

authme

Fix conflict

2015-11-01 23:37:12 +01:00