rails/rails — pull request #11581 by bughit (2013-07-24 17:40:04+00:00)
Title: don't convert mailer default values to procs

Invoke mailer defaults as procs only if they are procs, do not convert
with to_proc. That an object is convertible to a proc does not mean it's
meant to be always used as a proc. Fixes #11533

Conflicts:
actionmailer/CHANGELOG.md