Merge branch 'development' of https://github.com/Felizardo/KiwiIRC into Felizardo...
authorDarren <darren@darrenwhitlen.com>
Sun, 16 Jun 2013 14:43:34 +0000 (15:43 +0100)
committerDarren <darren@darrenwhitlen.com>
Sun, 16 Jun 2013 14:43:34 +0000 (15:43 +0100)

Trivial merge