Better wording of diff surpression.
Thx Jacob.
Update to gitlab-shell 1.5.0 during 5.3-5.4 update
Merge branch 'update_gitlab_shell_in_5_4_upgrade' of /home/git/repositories/gitlab/gitlabhq
Merge branch 'improve-wording' of /home/git/repositories/gitlab/gitlabhq
Merge branch 'master' of github.com:gitlabhq/gitlabhq