Merge branch 'master' of ssh://git-annex.branchable.com
authorJoey Hess <joeyh@joeyh.name>
Mon, 12 Oct 2015 17:17:01 +0000 (13:17 -0400)
committerJoey Hess <joeyh@joeyh.name>
Mon, 12 Oct 2015 17:17:01 +0000 (13:17 -0400)

Trivial merge