Merge branch 'master' into smudge
authorJoey Hess <joeyh@joeyh.name>
Mon, 21 Dec 2015 21:12:46 +0000 (17:12 -0400)
committerJoey Hess <joeyh@joeyh.name>
Mon, 21 Dec 2015 21:12:46 +0000 (17:12 -0400)
commitd82b110da8664cde8ddc52a3c57c8bbb5885a6af
tree272990b34fbc87167ddb1b2f047e39ef34a9bd37
parentfbf6c25de56fbdf25184052b7e38c4cedfe2a5bf
parentd3240f462262af9ef4db989fd9cfef5f773c6320
Merge branch 'master' into smudge
debian/changelog