Merge branch 'settings' of https://github.com/M2Ys4U/KiwiIRC into settings
authorDarren <darren@darrenwhitlen.com>
Sat, 10 Aug 2013 14:55:20 +0000 (15:55 +0100)
committerDarren <darren@darrenwhitlen.com>
Sat, 10 Aug 2013 14:55:20 +0000 (15:55 +0100)
commitfea3641a635672199c3766fe8a757fc1ef2d82d7
treed888ee08c0066949942d1f49bf3773b15ac3e6d4
parent0e4f8658e0d3c52640c3977855e797862f2294c3
parent498afd328adea860eb59b3ac5896cdd940c2b89f
Merge branch 'settings' of https://github.com/M2Ys4U/KiwiIRC into settings