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

Trivial merge