[DRE-commits] [ruby-oj] 01/03: Merge tag 'upstream/2.5.5'

[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 fa8c07325dec56b4d40981dcff6368015cc64e86
Merge: aab3c57 1cf2bf7
Author: Cédric Boutillier <boutil at debian.org>
Date:   Sat Mar 1 00:13:27 2014 +0100

    Merge tag 'upstream/2.5.5'
    
    Upstream version 2.5.5
    
    # gpg: Signature faite le sam. 01 mars 2014 00:13:25 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           |  33 ++++++++++++++-------------------
 checksums.yaml.gz   | Bin 269 -> 269 bytes
 ext/oj/oj.c         |   8 +++++++-
 ext/oj/parse.c      |  23 +++++++++++++++++++++++
 lib/oj.rb           |   8 ++++++++
 lib/oj/saj.rb       |   2 +-
 lib/oj/schandler.rb |   2 +-
 lib/oj/version.rb   |   2 +-
 metadata.yml        |   4 ++--
 test/test_fast.rb   |   1 -
 test/test_gc.rb     |   1 -
 test/test_saj.rb    |   1 -
 test/test_scp.rb    |   1 -
 test/test_writer.rb |   1 -
 test/tests.rb       |  52 ++++++++++++++++++++++++++++++++++++++++------------
 15 files changed, 97 insertions(+), 42 deletions(-)

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