Manuel Friedli 994088cc1a Merge branch 'master' of git.friedli.info:manuel/gentoo-overlay ... Conflicts: www-apps/gitlabhq/Manifest		2014-07-21 11:54:32 +02:00
..
gitlabhq	Merge branch 'master' of git.friedli.info:manuel/gentoo-overlay	2014-07-21 11:54:32 +02:00