ljacqu 103ebb44f0 Merge master into 306-commands-service ...

Conflicts:
- AuthMe
- CommandInitializer
- ConverterCommand

2015-12-26 21:33:25 +01:00

..

fr/xephi/authme

Merge master into 306-commands-service

2015-12-26 21:33:25 +01:00