Fix merge.
authorCarl Hetherington <cth@carlh.net>
Fri, 27 Jun 2014 23:54:09 +0000 (00:54 +0100)
committerCarl Hetherington <cth@carlh.net>
Fri, 27 Jun 2014 23:54:09 +0000 (00:54 +0100)
commit68c3938675624b4795271f1da7fb4f973b911de2
treeb8936e7f0cd8a31de8add7d0d25a59009ffae23c
parent6bcf76cc22ff0ed9c5598e1d92b05f93f37a510a
parent28568281aec2086f928c3799ecb18841daa69477
Fix merge.
debian/changelog