Merge branch 'master' of ssh://rvb.name/gitolite-admin