Merge branch 'master' into smudge
authorJoey Hess <joeyh@joeyh.name>
Wed, 16 Dec 2015 17:07:46 +0000 (13:07 -0400)
committerJoey Hess <joeyh@joeyh.name>
Wed, 16 Dec 2015 17:07:46 +0000 (13:07 -0400)
commit029111b89a7aec02643d61861771a1c9baa3ee81
tree054cd80a22354036a2f17401f532ed9d63724868
parent7800125783a812cf0c03d7305d8b635ba582cff7
parent1c3b64434583bdbac6ad241b91e653979ac5fc9e
Merge branch 'master' into smudge
debian/changelog