Merge branch 'master' into smudge
authorJoey Hess <joeyh@joeyh.name>
Wed, 9 Dec 2015 21:58:59 +0000 (17:58 -0400)
committerJoey Hess <joeyh@joeyh.name>
Wed, 9 Dec 2015 21:58:59 +0000 (17:58 -0400)
commitbf98d2bd7754355bf546fed6dc14a9758fd45970
tree5fc21e667f5840bd842d207a936b2ace466625a8
parentce73a96e4e5090e5b7618a564dc9405bec6c3de8
parente1961bf8066486d4fee263d2f81b3ab2bceeb132
Merge branch 'master' into smudge
debian/changelog