Merge branch 'master' of https://github.com/M2Ys4U/KiwiIRC
authorDarren <darren@darrenwhitlen.com>
Wed, 16 Nov 2011 22:50:58 +0000 (22:50 +0000)
committerDarren <darren@darrenwhitlen.com>
Wed, 16 Nov 2011 22:50:58 +0000 (22:50 +0000)

Trivial merge