[ngIRCd-GIT-ML] Alexander Barton : Merge branch 'automake-am11-am12'