removing an extra full stop
Removing an extra full stop
Merge pull request #2330 from pungoyal/master

Language copy changes
Update rubygems url inside Gemfile.lock
Add config to customize documentation.
Merge pull request #2363 from eloyesp/documenting_protected_methods

Generate documentation for protected methods.
Fix devise sender bug with custom devise mailers.

The devise sender detection must take into account that the default
sender set in the custom devise mailer can be a proc.
Merge pull request #2371 from tomasv/custom-devise-mailer-default-proc-fix

Fix devise sender bug with custom devise mailers.
:scissors: [ci skip]
Fix typo in test descriptions
Bundle update for both Rails 3.1 and 3.2, update mocha, fix failing tests
Bundle update
Fix session store changed in Rails master

There's no encrypted cookie store anymore, by default the cookie store
will be encrypted.
Use instance_eval instead of Proc#bind

Keep the implementation more similar to how it works in Action Mailer,
and avoid deprecation warnings with Proc#bind being raised in rails4
branch.
Merge branch 'master' into rails4