[ngIRCd-GIT-ML] Alexander Barton : Merge branch 'bug151-iconv' into master