Merge master.
authorCarl Hetherington <cth@carlh.net>
Sat, 30 Aug 2014 12:22:41 +0000 (13:22 +0100)
committerCarl Hetherington <cth@carlh.net>
Sat, 30 Aug 2014 12:22:41 +0000 (13:22 +0100)
commit2d24bc7aaed800415bce4fffe06f261d5e9e464a
tree8b8db697823e676e95a0d36466f559985f9bd6f7
parentfdc07bf53d35196bfe6514f34fa885dcfe9bc4b8
parent8db9e4f88fd3710dd972f0233e6f1b60b691a569
Merge master.
ChangeLog
debian/changelog