Merge branch 'development' of https://github.com/crtaylor123/KiwiIRC into crtaylor123...
authorDarren <darren@darrenwhitlen.com>
Mon, 21 Apr 2014 12:32:35 +0000 (13:32 +0100)
committerDarren <darren@darrenwhitlen.com>
Mon, 21 Apr 2014 12:32:35 +0000 (13:32 +0100)

Trivial merge