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)
commit0e4f8658e0d3c52640c3977855e797862f2294c3
tree86f7b21e8b38a1121e6bf70b521b12269a85b7ac
parentb70909a6fff01b0f2a4a4b21c274b44b1bbaa016
parentcbe8053290fe2cd89be8c73932477802cc04ef84
Merge branch 'settings' of https://github.com/M2Ys4U/KiwiIRC into settings