Merge branch 'development' of https://github.com/tonylechner/KiwiIRC into tonylechner...
authorDarren <darren@darrenwhitlen.com>
Fri, 3 Jan 2014 08:33:12 +0000 (08:33 +0000)
committerDarren <darren@darrenwhitlen.com>
Fri, 3 Jan 2014 08:33:12 +0000 (08:33 +0000)

Trivial merge