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

author Darren <darren@darrenwhitlen.com>

Sat, 28 Sep 2013 19:35:23 +0000 (20:35 +0100)

committer Darren <darren@darrenwhitlen.com>

Sat, 28 Sep 2013 19:35:23 +0000 (20:35 +0100)
author Darren <darren@darrenwhitlen.com>
Sat, 28 Sep 2013 19:35:23 +0000 (20:35 +0100)
committer Darren <darren@darrenwhitlen.com>
Sat, 28 Sep 2013 19:35:23 +0000 (20:35 +0100)
diff --cc client/assets/src/models/network.js
Simple merge
diff --cc server/irc/commands.js
Simple merge
diff --cc server/irc/connection.js
Simple merge
diff --cc server/irc/user.js
Simple merge
author	Darren <darren@darrenwhitlen.com>
	Sat, 28 Sep 2013 19:35:23 +0000 (20:35 +0100)
committer	Darren <darren@darrenwhitlen.com>
	Sat, 28 Sep 2013 19:35:23 +0000 (20:35 +0100)
		1	2
client/assets/src/models/network.js	patch \|	diff1 \|	diff2 \|	blob \| history
server/irc/commands.js	patch \|	diff1 \|	diff2 \|	blob \| history
server/irc/connection.js	patch \|	diff1 \|	diff2 \|	blob \| history
server/irc/user.js	patch \|	diff1 \|	diff2 \|	blob \| history