Merge branch 'master' of ssh://git-annex.branchable.com
authorJoey Hess <joeyh@joeyh.name>
Sat, 24 Dec 2016 21:16:07 +0000 (17:16 -0400)
committerJoey Hess <joeyh@joeyh.name>
Sat, 24 Dec 2016 21:16:07 +0000 (17:16 -0400)

Trivial merge