Merge branch '161-emails-on-push-service' of https://gitlab.com/jsternberg/gitlab-ce into jsternberg/gitlab-ce-161-emails-on-push-service
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG