[DRE-commits] [ruby-cri] 01/03: Merge tag 'upstream/2.6.1'

[Cédric Boutillier]

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

boutil pushed a commit to branch master
in repository ruby-cri.

commit 760e61ab9043c904030f1be77e2c7256d73e3d87
Merge: c903159 9ae89bf
Author: Cédric Boutillier <boutil at debian.org>
Date:   Mon Jun 9 21:26:20 2014 +0200

    Merge tag 'upstream/2.6.1'
    
    Upstream version 2.6.1
    
    # gpg: Signature faite le lun. 09 juin 2014 21:26:17 CEST avec la clef RSA d'identifiant 39CD217A
    # gpg: Bonne signature de « Cédric Boutillier <boutil at debian.org> »
    # gpg:                 alias « Cédric Boutillier <cedric.boutillier at upmc.fr> »
    # gpg:                 alias « Cédric Boutillier <cedric.boutillier at polytechnique.org> »
    # gpg:                 alias « Cédric Boutillier <cedric.boutillier at gmail.com> »

 Gemfile.lock                                       |  12 ++--
 NEWS.md                                            |  17 +++--
 README.adoc                                        |   2 +-
 checksums.yaml.gz                                  | Bin 270 -> 268 bytes
 lib/cri.rb                                         |   2 +
 lib/cri/command.rb                                 |   3 +
 lib/cri/commands/basic_help.rb                     |   2 +-
 lib/cri/core_ext/string.rb                         |  71 ++++-----------------
 lib/cri/help_renderer.rb                           |  33 ++++++----
 lib/cri/platform.rb                                |  30 +++++++++
 .../{core_ext/string.rb => string_formatter.rb}    |  46 +++++++++----
 lib/cri/version.rb                                 |   2 +-
 metadata.yml                                       |  10 +--
 test/test_command.rb                               |  14 ++++
 .../{test_core_ext.rb => test_string_formatter.rb} |  14 ++--
 15 files changed, 148 insertions(+), 110 deletions(-)

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