Merge branch 'master' of ssh://git-annex.branchable.com
authorJoey Hess <joeyh@joeyh.name>
Sat, 31 Oct 2015 01:47:09 +0000 (21:47 -0400)
committerJoey Hess <joeyh@joeyh.name>
Sat, 31 Oct 2015 01:47:09 +0000 (21:47 -0400)

Trivial merge