Merge branch 'master' of ssh://hummus/home/git/pub/git-tools