Merge branch 'winston' of https://github.com/M2Ys4U/KiwiIRC into winston
authorDarren <darren@darrenwhitlen.com>
Fri, 28 Mar 2014 16:09:59 +0000 (16:09 +0000)
committerDarren <darren@darrenwhitlen.com>
Fri, 28 Mar 2014 16:09:59 +0000 (16:09 +0000)
1  2 
server/irc/connection.js

Simple merge