Merge pull request #14797 from wjwithagen/wip-wjw-freebsd-config-path

author Yuri Weinstein <yuri.weinstein@gmail.com>

Thu, 27 Apr 2017 16:15:56 +0000 (09:15 -0700)

committer GitHub <noreply@github.com>

Thu, 27 Apr 2017 16:15:56 +0000 (09:15 -0700)
author Yuri Weinstein <yuri.weinstein@gmail.com>
Thu, 27 Apr 2017 16:15:56 +0000 (09:15 -0700)
committer GitHub <noreply@github.com>
Thu, 27 Apr 2017 16:15:56 +0000 (09:15 -0700)
diff --cc src/common/config.cc
Simple merge
diff --cc src/common/config_opts.h
Simple merge
author	Yuri Weinstein <yuri.weinstein@gmail.com>
	Thu, 27 Apr 2017 16:15:56 +0000 (09:15 -0700)
committer	GitHub <noreply@github.com>
	Thu, 27 Apr 2017 16:15:56 +0000 (09:15 -0700)
		1	2
src/common/config.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/common/config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history