Merge branch 'master' of git://github.com/M2Ys4U/KiwiIRC
authorDarren <darren@darrenwhitlen.com>
Mon, 26 Sep 2011 20:20:34 +0000 (21:20 +0100)
committerDarren <darren@darrenwhitlen.com>
Mon, 26 Sep 2011 20:20:34 +0000 (21:20 +0100)

Trivial merge