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)
commit5d398836a9b6acc2bbb536dabbd7bbc42a098659
tree7f613198c979212efb4e82a6f6250576a0edecef
parent568e553f506809e753c78a0e0cbad5906bc002b1
parent833d037185b37863d10adaa967c251038d9038e5
Fix merge.
src/lib/config.cc
src/lib/writer.cc