Merge branch 'master' of ssh://git-annex.branchable.com
authorJoey Hess <joeyh@joeyh.name>
Mon, 19 Oct 2015 19:57:26 +0000 (15:57 -0400)
committerJoey Hess <joeyh@joeyh.name>
Mon, 19 Oct 2015 19:57:26 +0000 (15:57 -0400)

Trivial merge