GitLab

Conflicts:
	component/apache-php/buildout.cfg
	component/git/buildout.cfg
	component/mariadb/buildout.cfg
	slapos/recipe/request.py
	software/drupal/instance.cfg
	stack/lamp/buildout.cfg
	stack/nbd.cfg