Merge remote-tracking branch 'darkrose/master'

author Perttu Ahola <celeron55@gmail.com>

Mon, 26 Sep 2011 08:57:28 +0000 (11:57 +0300)

committer Perttu Ahola <celeron55@gmail.com>

Mon, 26 Sep 2011 08:57:28 +0000 (11:57 +0300)
author Perttu Ahola <celeron55@gmail.com>
Mon, 26 Sep 2011 08:57:28 +0000 (11:57 +0300)
committer Perttu Ahola <celeron55@gmail.com>
Mon, 26 Sep 2011 08:57:28 +0000 (11:57 +0300)
diff --cc src/client.cpp
Simple merge
diff --cc src/server.cpp
Simple merge
author	Perttu Ahola <celeron55@gmail.com>
	Mon, 26 Sep 2011 08:57:28 +0000 (11:57 +0300)
committer	Perttu Ahola <celeron55@gmail.com>
	Mon, 26 Sep 2011 08:57:28 +0000 (11:57 +0300)
		1	2
src/client.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/server.cpp	patch \|	diff1 \|	diff2 \|	blob \| history