Merge branch 'master' of github.com:prawnsalad/KiwiIRC
authorJack Allnutt <m2ys4u@Gmail.com>
Mon, 3 Oct 2011 22:25:20 +0000 (23:25 +0100)
committerJack Allnutt <m2ys4u@Gmail.com>
Mon, 3 Oct 2011 22:25:20 +0000 (23:25 +0100)

Trivial merge