.
Merge branch 'master' of https://github.com/LuisPalacios/docker-gitolite

Conflicts:
	README.md