Merge pull request #30769 from smithfarm/wip-41888-nautilus

author Yuri Weinstein <yweinste@redhat.com>

Fri, 10 Jan 2020 20:19:41 +0000 (12:19 -0800)

committer GitHub <noreply@github.com>

Fri, 10 Jan 2020 20:19:41 +0000 (12:19 -0800)
author Yuri Weinstein <yweinste@redhat.com>
Fri, 10 Jan 2020 20:19:41 +0000 (12:19 -0800)
committer GitHub <noreply@github.com>
Fri, 10 Jan 2020 20:19:41 +0000 (12:19 -0800)
diff --cc src/client/Client.cc
Simple merge
diff --cc src/client/Client.h
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Fri, 10 Jan 2020 20:19:41 +0000 (12:19 -0800)
committer	GitHub <noreply@github.com>
	Fri, 10 Jan 2020 20:19:41 +0000 (12:19 -0800)
		1	2
src/client/Client.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/client/Client.h	patch \|	diff1 \|	diff2 \|	blob \| history