Merge branch 'master' of github.com:prawnsalad/KiwiIRC
authorJack Allnutt <m2ys4u@gmail.com>
Tue, 23 Apr 2013 02:39:51 +0000 (03:39 +0100)
committerJack Allnutt <m2ys4u@gmail.com>
Tue, 23 Apr 2013 02:39:51 +0000 (03:39 +0100)

Trivial merge