Merge branch 'development' of https://github.com/prawnsalad/KiwiIRC into development
authorBorja <bmp_86@hotmail.com>
Wed, 27 Aug 2014 13:43:17 +0000 (15:43 +0200)
committerBorja <bmp_86@hotmail.com>
Wed, 27 Aug 2014 13:43:17 +0000 (15:43 +0200)

Trivial merge