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)
1  2 
debian/changelog

Simple merge