[DRE-commits] [ruby-oj] 01/02: Merge tag 'upstream/2.5.3'

[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 5738f9eb22e449506487d1407c99ea9fa3c5790d
Merge: d72940d 772d7e2
Author: Cédric Boutillier <boutil at debian.org>
Date:   Fri Jan 10 08:14:54 2014 +0100

    Merge tag 'upstream/2.5.3'
    
    Upstream version 2.5.3
    
    # gpg: Signature faite le ven. 10 janv. 2014 08:14:53 CET avec la clef RSA d'identifiant 8F9F8F09
    # 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           |  21 +++--------
 checksums.yaml.gz   | Bin 270 -> 269 bytes
 ext/oj/dump.c       |  70 ++++++++++++++++++++++++++---------
 ext/oj/oj.c         | 103 +++++++++++++++++++++++++++++++++++++++++++++++-----
 ext/oj/oj.h         |   1 +
 ext/oj/val_stack.h  |   3 +-
 lib/oj/version.rb   |   2 +-
 metadata.yml        |  54 +++++++++++++--------------
 test/bug.rb         |   4 +-
 test/test_writer.rb |  45 ++++++++++++++++++++++-
 10 files changed, 228 insertions(+), 75 deletions(-)

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