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

Trivial merge