Merge branch 'settings' of https://github.com/M2Ys4U/KiwiIRC into settings
authorDarren <darren@darrenwhitlen.com>
Sat, 10 Aug 2013 12:46:48 +0000 (13:46 +0100)
committerDarren <darren@darrenwhitlen.com>
Sat, 10 Aug 2013 12:46:48 +0000 (13:46 +0100)

Trivial merge