Merge branch 'dropproof'
authorJoey Hess <joeyh@joeyh.name>
Fri, 9 Oct 2015 22:03:00 +0000 (18:03 -0400)
committerJoey Hess <joeyh@joeyh.name>
Fri, 9 Oct 2015 22:03:00 +0000 (18:03 -0400)

Trivial merge