Merge branch 'master' into smudge
authorJoey Hess <joeyh@joeyh.name>
Mon, 7 Dec 2015 16:29:34 +0000 (12:29 -0400)
committerJoey Hess <joeyh@joeyh.name>
Mon, 7 Dec 2015 16:29:34 +0000 (12:29 -0400)
commit62a2fba1cdf63900b7e4c2c7b7f85dc7b5770ebb
tree7f888f12ff6e6af5841bba8c409a1ffab0292017
parent2fe21d47c54bca4a7bb339d991105cfea460d876
parentbd6f694687f8d7da62c68cfb634c593774f3740f
Merge branch 'master' into smudge
debian/changelog