[DRE-commits] [capistrano] 03/04: Merge tag 'upstream/3.2.1'

[Sebastien Badia]

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

sbadia-guest pushed a commit to branch master
in repository capistrano.

commit 1b7014562b0dde8dffaeb92c66ec122a385bfced
Merge: d977c40 2d12873
Author: Sebastien Badia <seb at sebian.fr>
Date:   Mon May 26 14:39:17 2014 +0200

    Merge tag 'upstream/3.2.1'
    
    Upstream version 3.2.1

 CHANGELOG.md                                       |  16 +++++++++++++++-
 README.md                                          |   6 +++---
 checksums.yaml.gz                                  | Bin 267 -> 267 bytes
 lib/capistrano/configuration.rb                    |   4 ++++
 lib/capistrano/configuration/question.rb           |   2 +-
 lib/capistrano/dsl.rb                              |   3 ++-
 lib/capistrano/dsl/env.rb                          |   7 +------
 lib/capistrano/dsl/task_enhancements.rb            |   6 ++----
 lib/capistrano/git.rb                              |   2 +-
 lib/capistrano/i18n.rb                             |   5 ++---
 lib/capistrano/version.rb                          |   2 +-
 metadata.yml                                       |   4 ++--
 spec/integration/dsl_spec.rb                       |   2 +-
 spec/lib/capistrano/configuration/question_spec.rb |   4 ++--
 spec/lib/capistrano/configuration_spec.rb          |  13 +++++++++++++
 spec/lib/capistrano/dsl_spec.rb                    |  11 +++++++++++
 16 files changed, 61 insertions(+), 26 deletions(-)

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