Fix mis-merge.
authorCarl Hetherington <cth@carlh.net>
Sun, 26 Oct 2014 22:44:12 +0000 (22:44 +0000)
committerCarl Hetherington <cth@carlh.net>
Sun, 26 Oct 2014 22:44:12 +0000 (22:44 +0000)
commit2edc49fef2633ee7fe6b7b2a14f4e122e17798e2
treeed28d5b0a589309aeb04b5f64b429e2055c6d436
parent0bd835375d015ef353cf4a7927e25afd140466d9
Fix mis-merge.
debian/changelog