Merge branch 'master' of ssh://git-annex.branchable.com
authorJoey Hess <joeyh@joeyh.name>
Wed, 14 Oct 2015 16:37:58 +0000 (12:37 -0400)
committerJoey Hess <joeyh@joeyh.name>
Wed, 14 Oct 2015 16:37:58 +0000 (12:37 -0400)

Trivial merge