Manuel Friedli 3a45b92e02 Merge branch 'master' into gitlab-8-11-0-rc1		2016-08-02 13:11:31 +02:00
..
gitlab-ce	Merge branch 'master' into gitlab-8-11-0-rc1	2016-08-02 13:11:31 +02:00