Merge branch 'master' of ssh://git-annex.branchable.com
authorJoey Hess <joeyh@joeyh.name>
Tue, 15 Nov 2016 15:00:04 +0000 (11:00 -0400)
committerJoey Hess <joeyh@joeyh.name>
Tue, 15 Nov 2016 15:00:04 +0000 (11:00 -0400)

Trivial merge