Manuel Friedli 40d9208c68 Merge branch 'master' into feature/gitlabhq-7.6 ... Conflicts: www-apps/gitlabhq/Manifest		2015-01-26 16:44:56 +01:00
..
gitlab-ci	added ebuild for gitlab-ci-5.2.1	2014-12-05 23:06:48 +01:00
gitlabhq	Merge branch 'master' into feature/gitlabhq-7.6	2015-01-26 16:44:56 +01:00