rails/rails — pull request #18183 by danbernier (2014-12-24 16:15:01+00:00)
Title: Fix bug in ActionMailer guide.

When setting a mailer's default from address, you have to pass a hash
with a `:from` key; you can't pass just an email address.