Merge branch 'master' of github.com:gitlabhq/gitlabhq
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq
Merge branch 'master' of github.com:gitlabhq/gitlabhq