Merge branch 'master' of github.com:gitlabhq/gitlab-shell

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	support/rewrite-hooks.sh