Merge branch 'master' of github.com:prawnsalad/KiwiIRC
authorJack Allnutt <m2ys4u@gmail.com>
Thu, 28 Mar 2013 13:53:12 +0000 (13:53 +0000)
committerJack Allnutt <m2ys4u@gmail.com>
Thu, 28 Mar 2013 13:53:12 +0000 (13:53 +0000)

Trivial merge