Merge branch 'master' of github.com:prawnsalad/KiwiIRC
authorJack Allnutt <m2ys4u@Gmail.com>
Sat, 3 Nov 2012 20:54:38 +0000 (20:54 +0000)
committerJack Allnutt <m2ys4u@Gmail.com>
Sat, 3 Nov 2012 20:54:38 +0000 (20:54 +0000)

Trivial merge