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