Manuel Friedli d0434ed0c9 Merge branch 'master' into feature/gitlab-6.9.2 ... Conflicts: www-apps/gitlabhq/Manifest		2014-07-20 21:25:26 +02:00
..
gitlabhq	Merge branch 'master' into feature/gitlab-6.9.2	2014-07-20 21:25:26 +02:00