Merge pull request #8925 from ukernel/wip-15723

author John Spray <jspray@redhat.com>

Fri, 3 Jun 2016 10:50:55 +0000 (11:50 +0100)

committer John Spray <jspray@redhat.com>

Fri, 3 Jun 2016 10:50:55 +0000 (11:50 +0100)
author John Spray <jspray@redhat.com>
Fri, 3 Jun 2016 10:50:55 +0000 (11:50 +0100)
committer John Spray <jspray@redhat.com>
Fri, 3 Jun 2016 10:50:55 +0000 (11:50 +0100)
diff --cc src/client/Client.cc
Simple merge
diff --cc src/client/Client.h
Simple merge
author	John Spray <jspray@redhat.com>
	Fri, 3 Jun 2016 10:50:55 +0000 (11:50 +0100)
committer	John Spray <jspray@redhat.com>
	Fri, 3 Jun 2016 10:50:55 +0000 (11:50 +0100)
		1	2
src/client/Client.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/client/Client.h	patch \|	diff1 \|	diff2 \|	blob \| history