Merge pull request #32915 from smithfarm/wip-43628-nautilus

author Yuri Weinstein <yweinste@redhat.com>

Tue, 11 Feb 2020 16:03:05 +0000 (08:03 -0800)

committer GitHub <noreply@github.com>

Tue, 11 Feb 2020 16:03:05 +0000 (08:03 -0800)
author Yuri Weinstein <yweinste@redhat.com>
Tue, 11 Feb 2020 16:03:05 +0000 (08:03 -0800)
committer GitHub <noreply@github.com>
Tue, 11 Feb 2020 16:03:05 +0000 (08:03 -0800)
diff --cc src/client/Client.cc
Simple merge
diff --cc src/common/options.cc
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Tue, 11 Feb 2020 16:03:05 +0000 (08:03 -0800)
committer	GitHub <noreply@github.com>
	Tue, 11 Feb 2020 16:03:05 +0000 (08:03 -0800)
		1	2
src/client/Client.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/common/options.cc	patch \|	diff1 \|	diff2 \|	blob \| history