Merge branch 'master' of ssh://git-annex.branchable.com
authorJoey Hess <joeyh@joeyh.name>
Tue, 13 Dec 2016 16:16:18 +0000 (12:16 -0400)
committerJoey Hess <joeyh@joeyh.name>
Tue, 13 Dec 2016 16:16:18 +0000 (12:16 -0400)

Trivial merge