* tools/hook-scripts/mailer/mailer.py   Lose some commit conflict marker cruft.
* tools/hook-scripts/mailer/mailer.py
  Lose some commit conflict marker cruft.

jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion