Fix merge.
authorCarl Hetherington <cth@carlh.net>
Fri, 27 Jun 2014 23:53:41 +0000 (00:53 +0100)
committerCarl Hetherington <cth@carlh.net>
Fri, 27 Jun 2014 23:53:41 +0000 (00:53 +0100)
commit6bcf76cc22ff0ed9c5598e1d92b05f93f37a510a
tree6d3280819c82b6573f68123a6af08e0bf953feee
parentfd5567a6bbecf6f7e213e25284b3baf01f7a96e2
Fix merge.
debian/changelog