[DRE-commits] [rails-3.2] 03/11: Merge tag 'upstream/3.2.17'

[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 c9195e64716aa71716bdbd29156e785b83d26759
Merge: adde635 09804e7
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Thu Feb 20 17:11:40 2014 -0300

    Merge tag 'upstream/3.2.17'
    
    Upstream version 3.2.17
    
    # gpg: Signature made Qui 20 Fev 2014 17:11:34 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>"

 RAILS_VERSION                                      |  2 +-
 actionmailer/lib/action_mailer/version.rb          |  2 +-
 actionpack/CHANGELOG.md                            | 10 +++++
 actionpack/lib/action_pack/version.rb              |  2 +-
 .../lib/action_view/helpers/number_helper.rb       | 14 +++++-
 actionpack/lib/action_view/template/text.rb        |  2 +-
 actionpack/test/template/number_helper_test.rb     | 51 ++++++++++++++++++++++
 actionpack/test/template/text_test.rb              | 17 ++++++++
 activemodel/lib/active_model/version.rb            |  2 +-
 activerecord/lib/active_record/version.rb          |  2 +-
 activeresource/lib/active_resource/version.rb      |  2 +-
 activesupport/lib/active_support/version.rb        |  2 +-
 railties/lib/rails/version.rb                      |  2 +-
 version.rb                                         |  2 +-
 14 files changed, 101 insertions(+), 11 deletions(-)

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