Fix mis-merge.
authorCarl Hetherington <cth@carlh.net>
Sun, 26 Oct 2014 22:44:33 +0000 (22:44 +0000)
committerCarl Hetherington <cth@carlh.net>
Sun, 26 Oct 2014 22:44:33 +0000 (22:44 +0000)
commit542deed3b0099c7d1c03c6f48b8ae8899fa4f918
tree6abc8c29f06e03e9b69486bae4037a1859d99978
parent2edc49fef2633ee7fe6b7b2a14f4e122e17798e2
parent53351b4f2f5a08a5d220c34785291979a5283161
Fix mis-merge.
debian/changelog