Merge branch 'master' of github.com:prawnsalad/KiwiIRC
authorJack Allnutt <m2ys4u@Gmail.com>
Fri, 16 Sep 2011 13:53:06 +0000 (14:53 +0100)
committerJack Allnutt <m2ys4u@Gmail.com>
Fri, 16 Sep 2011 13:53:06 +0000 (14:53 +0100)

Trivial merge