Merge branch 'master' of https://github.com/ronag/Server into ronag-master

author Helge Norberg <helge.norberg@gmail.com>

Tue, 8 Oct 2013 09:45:36 +0000 (11:45 +0200)

committer Helge Norberg <helge.norberg@gmail.com>

Tue, 8 Oct 2013 09:45:36 +0000 (11:45 +0200)
author Helge Norberg <helge.norberg@gmail.com>
Tue, 8 Oct 2013 09:45:36 +0000 (11:45 +0200)
committer Helge Norberg <helge.norberg@gmail.com>
Tue, 8 Oct 2013 09:45:36 +0000 (11:45 +0200)
diff --cc shell/casparcg.config
Simple merge
diff --cc shell/server.cpp
Simple merge
author	Helge Norberg <helge.norberg@gmail.com>
	Tue, 8 Oct 2013 09:45:36 +0000 (11:45 +0200)
committer	Helge Norberg <helge.norberg@gmail.com>
	Tue, 8 Oct 2013 09:45:36 +0000 (11:45 +0200)
		1	2
shell/casparcg.config	patch \|	diff1 \|	diff2 \|	blob \| history
shell/server.cpp	patch \|	diff1 \|	diff2 \|	blob \| history