Merge branch 'master' of git://github.com/M2Ys4U/KiwiIRC
authorDarren <darren@darrenwhitlen.com>
Mon, 15 Aug 2011 17:47:59 +0000 (18:47 +0100)
committerDarren <darren@darrenwhitlen.com>
Mon, 15 Aug 2011 17:47:59 +0000 (18:47 +0100)

Trivial merge