Merge pull request #10106 from xiaoxichen/wip-16215-jewel

author Loic Dachary <loic@dachary.org>

Tue, 23 Aug 2016 06:47:37 +0000 (08:47 +0200)

committer GitHub <noreply@github.com>

Tue, 23 Aug 2016 06:47:37 +0000 (08:47 +0200)
author Loic Dachary <loic@dachary.org>
Tue, 23 Aug 2016 06:47:37 +0000 (08:47 +0200)
committer GitHub <noreply@github.com>
Tue, 23 Aug 2016 06:47:37 +0000 (08:47 +0200)
diff --cc src/client/Client.cc
Simple merge
diff --cc src/client/Client.h
Simple merge
author	Loic Dachary <loic@dachary.org>
	Tue, 23 Aug 2016 06:47:37 +0000 (08:47 +0200)
committer	GitHub <noreply@github.com>
	Tue, 23 Aug 2016 06:47:37 +0000 (08:47 +0200)
		1	2
src/client/Client.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/client/Client.h	patch \|	diff1 \|	diff2 \|	blob \| history