Merge branch 'master' into smudge
authorJoey Hess <joeyh@joeyh.name>
Thu, 10 Dec 2015 18:07:11 +0000 (14:07 -0400)
committerJoey Hess <joeyh@joeyh.name>
Thu, 10 Dec 2015 18:07:11 +0000 (14:07 -0400)
commit3d936fdb59b4af8565ab914eb2ea860e98b47e92
treea4e29e4729c43157945b8db6659f9504436e7db2
parent3719d1b390099736533d79f004793b09b6f1c618
parentb376047cc3c65929a95eb5901fe6dc72d7f15f58
Merge branch 'master' into smudge
debian/changelog