Merge branch 'development' into multi_server
authorDarren <darren@Darrens-MacBook-Pro.local>
Mon, 6 May 2013 15:41:40 +0000 (16:41 +0100)
committerDarren <darren@Darrens-MacBook-Pro.local>
Mon, 6 May 2013 15:41:40 +0000 (16:41 +0100)
1  2 
server/irc/connection.js

Simple merge