Merge branch 'master' of ssh://git-annex.branchable.com
authorJoey Hess <joeyh@joeyh.name>
Tue, 20 Oct 2015 04:43:53 +0000 (00:43 -0400)
committerJoey Hess <joeyh@joeyh.name>
Tue, 20 Oct 2015 04:43:53 +0000 (00:43 -0400)

Trivial merge