Merge branch 'development' of github.com:prawnsalad/KiwiIRC into development
authorJack Allnutt <jack@allnutt.eu>
Sun, 4 Aug 2013 07:11:07 +0000 (08:11 +0100)
committerJack Allnutt <jack@allnutt.eu>
Sun, 4 Aug 2013 07:11:07 +0000 (08:11 +0100)

Trivial merge