Merge branch 'master' of ssh://git-annex.branchable.com
authorJoey Hess <joeyh@joeyh.name>
Fri, 6 Nov 2015 17:45:27 +0000 (13:45 -0400)
committerJoey Hess <joeyh@joeyh.name>
Fri, 6 Nov 2015 17:45:27 +0000 (13:45 -0400)

Trivial merge