Merge pull request #10877 from dachary/wip-16946-jewel

author Loic Dachary <loic@dachary.org>

Mon, 17 Oct 2016 12:26:30 +0000 (14:26 +0200)

committer GitHub <noreply@github.com>

Mon, 17 Oct 2016 12:26:30 +0000 (14:26 +0200)
author Loic Dachary <loic@dachary.org>
Mon, 17 Oct 2016 12:26:30 +0000 (14:26 +0200)
committer GitHub <noreply@github.com>
Mon, 17 Oct 2016 12:26:30 +0000 (14:26 +0200)
diff --cc src/client/Client.cc
Simple merge
diff --cc src/client/Client.h
Simple merge
author	Loic Dachary <loic@dachary.org>
	Mon, 17 Oct 2016 12:26:30 +0000 (14:26 +0200)
committer	GitHub <noreply@github.com>
	Mon, 17 Oct 2016 12:26:30 +0000 (14:26 +0200)
		1	2
src/client/Client.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/client/Client.h	patch \|	diff1 \|	diff2 \|	blob \| history