Manuel Friedli e81c4ea462 Merge branch 'master' into feature/gitlab-6.9.2 ... Conflicts: www-apps/gitlabhq/Manifest		2014-07-20 23:40:39 +02:00
..
gitlabhq	Merge branch 'master' into feature/gitlab-6.9.2	2014-07-20 23:40:39 +02:00