Merge branch 'master' of git://github.com/M2Ys4U/KiwiIRC
authorDarren <darren@darrenwhitlen.com>
Fri, 22 Jul 2011 18:54:00 +0000 (19:54 +0100)
committerDarren <darren@darrenwhitlen.com>
Fri, 22 Jul 2011 18:54:00 +0000 (19:54 +0100)

Trivial merge