trunk
No idea why dos2unix is needed.
Follow up to 1872398: Use 0 for default smtp_port instead of smtplib.SMTP_PORT
* tools/hook-scripts/mailer/mailer.py: (Config.repos_params): don't use "defaults" for the merged values. The comments make this confusing. Use "merged" for clarity.