Another mis-merge.
authorCarl Hetherington <cth@carlh.net>
Fri, 7 Apr 2017 23:45:45 +0000 (00:45 +0100)
committerCarl Hetherington <cth@carlh.net>
Wed, 19 Apr 2017 22:04:32 +0000 (23:04 +0100)
commitad0c51a63b40922c900ccc03c3b6417874a8c981
treec2360ac426e868a16fa8a60330d6fd33f75c1ee1
parent71b42c48087a4f05f55166e328d1bea3b2b2228b
Another mis-merge.
src/lib/config.cc