Merge git://github.com/M2Ys4U/KiwiIRC into dev
authorDarren <darren@darrenwhitlen.com>
Sat, 16 Jul 2011 22:38:41 +0000 (23:38 +0100)
committerDarren <darren@darrenwhitlen.com>
Sat, 16 Jul 2011 22:38:41 +0000 (23:38 +0100)
commitb9c9cceba029186dd59183a9ff9163c2d5726b0e
tree5652babacab9839542ad6f2490d56267c66154e6
parent784ae1065cc191d8891dff8ca9eaba1044b3ec38
parent0417bcfa68399946267409361ff2d2219f594ba0
Merge git://github.com/M2Ys4U/KiwiIRC into dev

Conflicts:
index.php
index.php
js/gateway.js
node/config.json
node/kiwi.js