Fix merge.
authorCarl Hetherington <cth@carlh.net>
Wed, 9 Oct 2013 09:50:26 +0000 (10:50 +0100)
committerCarl Hetherington <cth@carlh.net>
Wed, 9 Oct 2013 09:50:26 +0000 (10:50 +0100)
1  2 
src/lib/config.cc
src/lib/writer.cc

Simple merge
Simple merge