Merge #2768

author Michal 'vorner' Vaner <michal.vaner@nic.cz>

Mon, 11 Mar 2013 08:50:53 +0000 (09:50 +0100)

committer Michal 'vorner' Vaner <michal.vaner@nic.cz>

Mon, 11 Mar 2013 08:58:21 +0000 (09:58 +0100)
author Michal 'vorner' Vaner <michal.vaner@nic.cz>
Mon, 11 Mar 2013 08:50:53 +0000 (09:50 +0100)
committer Michal 'vorner' Vaner <michal.vaner@nic.cz>
Mon, 11 Mar 2013 08:58:21 +0000 (09:58 +0100)
diff --cc src/lib/cc/session.cc
Simple merge
diff --cc src/lib/config/tests/ccsession_unittests.cc
Simple merge
diff --cc src/lib/config/tests/fake_session.cc
Simple merge
author	Michal 'vorner' Vaner <michal.vaner@nic.cz>
	Mon, 11 Mar 2013 08:50:53 +0000 (09:50 +0100)
committer	Michal 'vorner' Vaner <michal.vaner@nic.cz>
	Mon, 11 Mar 2013 08:58:21 +0000 (09:58 +0100)
		1	2
src/lib/cc/session.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/lib/config/tests/ccsession_unittests.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/lib/config/tests/fake_session.cc	patch \|	diff1 \|	diff2 \|	blob \| history