include example mailer options. Fixes #3171
Merge branch 'master' of https://github.com/slide/gitlabhq