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

Trivial merge