Merge branch 'master' of ssh://git.stderr.nl/projects/chimara/chimara