merged gitolite support