Merge branch 'master' into smudge
authorJoey Hess <joeyh@joeyh.name>
Tue, 15 Dec 2015 16:01:21 +0000 (12:01 -0400)
committerJoey Hess <joeyh@joeyh.name>
Tue, 15 Dec 2015 16:01:21 +0000 (12:01 -0400)
commitf5d4ee9b6336eba128b0438b609322cbacb7ace7
tree5a20f60918f53de0da2c7dd0e4ddb416aef06fd9
parent42caf42857f9c993dc96603c4938213f84068d52
parent04e00146edd3b126b403e08c9674155c374edd03
Merge branch 'master' into smudge
debian/changelog