Merge branch 'master' of ssh://git-annex.branchable.com
authorJoey Hess <joeyh@joeyh.name>
Tue, 3 Nov 2015 16:12:53 +0000 (12:12 -0400)
committerJoey Hess <joeyh@joeyh.name>
Tue, 3 Nov 2015 16:12:53 +0000 (12:12 -0400)

Trivial merge