Merge branch 'chanlist' of https://github.com/CoryChaplin/KiwiIRC into development
authorDarren <darren@darrenwhitlen.com>
Thu, 27 Mar 2014 17:08:57 +0000 (17:08 +0000)
committerDarren <darren@darrenwhitlen.com>
Thu, 27 Mar 2014 17:08:57 +0000 (17:08 +0000)

Trivial merge