[DRE-commits] [rails-3.2] 02/03: Merge tag 'upstream/3.2.18'

[Antonio Terceiro]

This is an automated email from the git hooks/post-receive script.

terceiro pushed a commit to branch master
in repository rails-3.2.

commit da812071e38f7824714e86ecd752d9444fae4190
Merge: 309e632 6220c53
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Sat May 10 15:09:51 2014 -0300

    Merge tag 'upstream/3.2.18'
    
    Upstream version 3.2.18
    
    # gpg: Signature made Sáb 10 Mai 2014 15:09:49 BRT using RSA key ID CD460BDE
    # gpg: Good signature from "Antonio Terceiro <terceiro at softwarelivre.org>"
    # gpg:                 aka "Antonio Terceiro <terceiro at dcc.ufba.br>"
    # gpg:                 aka "Antonio Terceiro <terceiro at colivre.coop.br>"
    # gpg:                 aka "Antonio Terceiro <terceiro at debian.org>"
    # gpg:                 aka "Antonio Terceiro <antonio.terceiro at linaro.org>"
    # gpg:                 aka "Antonio Terceiro <terceiro at cs.ubc.ca>"

 Gemfile                                            |  2 +-
 RAILS_VERSION                                      |  2 +-
 actionmailer/CHANGELOG.md                          | 15 ++++++++++++
 actionmailer/lib/action_mailer/version.rb          |  2 +-
 actionpack/CHANGELOG.md                            | 14 +++++++++++
 actionpack/lib/abstract_controller/base.rb         | 28 +++++++++++++++++++---
 actionpack/lib/action_pack/version.rb              |  2 +-
 .../new_base/render_implicit_action_test.rb        | 17 ++++++++++++-
 .../test/template/number_helper_i18n_test.rb       | 10 ++++----
 activemodel/CHANGELOG.md                           | 15 ++++++++++++
 activemodel/lib/active_model/version.rb            |  2 +-
 activerecord/CHANGELOG.md                          | 15 ++++++++++++
 activerecord/lib/active_record/version.rb          |  2 +-
 activeresource/CHANGELOG.md                        | 16 +++++++++++++
 activeresource/lib/active_resource/version.rb      |  2 +-
 activesupport/CHANGELOG.md                         | 15 ++++++++++++
 activesupport/lib/active_support/version.rb        |  2 +-
 railties/CHANGELOG.md                              | 16 +++++++++++++
 railties/lib/rails/version.rb                      |  2 +-
 version.rb                                         |  2 +-
 20 files changed, 162 insertions(+), 19 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/rails-3.2.git