Merge branch 'master' of ssh://git-annex.branchable.com
authorJoey Hess <joeyh@joeyh.name>
Thu, 15 Oct 2015 15:42:55 +0000 (11:42 -0400)
committerJoey Hess <joeyh@joeyh.name>
Thu, 15 Oct 2015 15:42:55 +0000 (11:42 -0400)

Trivial merge