Merge branch 'master' of github.com:prawnsalad/KiwiIRC
authorJack Allnutt <m2ys4u@gmail.com>
Sat, 1 Jun 2013 17:35:07 +0000 (18:35 +0100)
committerJack Allnutt <m2ys4u@gmail.com>
Sat, 1 Jun 2013 17:35:07 +0000 (18:35 +0100)

Trivial merge