[DRE-commits] [ruby-oj] 01/04: Merge tag 'upstream/2.10.2'

[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-oj.

commit 4ecf377dc2af90c09ccc2659f85018d986b2fec5
Merge: 07fdda3 80a594a
Author: Cédric Boutillier <boutil at debian.org>
Date:   Wed Aug 27 05:34:27 2014 +0200

    Merge tag 'upstream/2.10.2'
    
    Upstream version 2.10.2
    
    # gpg: Signature faite le mer. 27 août 2014 05:34:24 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> »

 README.md         |  17 ++---------------
 checksums.yaml.gz | Bin 268 -> 0 bytes
 ext/oj/compat.c   |   2 +-
 ext/oj/object.c   |   8 ++++----
 ext/oj/reader.c   |  16 +++++++++-------
 ext/oj/reader.h   |   2 +-
 lib/oj/version.rb |   2 +-
 metadata.yml      |   5 +++--
 test/mod.rb       |  16 ++++++++++++++++
 9 files changed, 37 insertions(+), 31 deletions(-)

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