Merge branch 'master' of github.com:pounard/mailer