Merge branch 'ircv3' of https://github.com/M2Ys4U/KiwiIRC into M2Ys4U-ircv3

author Darren <darren@darrenwhitlen.com>

Sun, 11 Nov 2012 14:44:56 +0000 (14:44 +0000)

committer Darren <darren@darrenwhitlen.com>

Sun, 11 Nov 2012 14:44:56 +0000 (14:44 +0000)
author Darren <darren@darrenwhitlen.com>
Sun, 11 Nov 2012 14:44:56 +0000 (14:44 +0000)
committer Darren <darren@darrenwhitlen.com>
Sun, 11 Nov 2012 14:44:56 +0000 (14:44 +0000)
diff --cc client/assets/dev/model_application.js
Simple merge
diff --cc server/irc/commands.js
Simple merge
diff --cc server/irc/connection.js
Simple merge
author	Darren <darren@darrenwhitlen.com>
	Sun, 11 Nov 2012 14:44:56 +0000 (14:44 +0000)
committer	Darren <darren@darrenwhitlen.com>
	Sun, 11 Nov 2012 14:44:56 +0000 (14:44 +0000)
		1	2
client/assets/dev/model_application.js	patch \|	diff1 \|	diff2 \|	blob \| history
server/irc/commands.js	patch \|	diff1 \|	diff2 \|	blob \| history
server/irc/connection.js	patch \|	diff1 \|	diff2 \|	blob \| history