Manuel Friedli 52959f7695 Merge branch 'master' into 56-gitlab-8-12-3		2016-10-11 11:53:42 +02:00
..
gitlab-ce	Merge branch 'master' into 56-gitlab-8-12-3	2016-10-11 11:53:42 +02:00