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

[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 8ac22d01653dd9d8759d7c7153ca0a183dbebae3
Merge: 2504c2a 6089ab9
Author: Cédric Boutillier <boutil at debian.org>
Date:   Sun May 24 23:02:52 2015 +0200

    Merge tag 'upstream/2.12.8'
    
    Upstream version 2.12.8
    
    # gpg: Signature faite le dim. 24 mai 2015 23:02:51 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         |  5 +++--
 ext/oj/dump.c     | 10 +++++-----
 ext/oj/fast.c     |  2 +-
 ext/oj/object.c   |  4 ++--
 ext/oj/odd.c      |  8 ++++----
 ext/oj/oj.c       |  3 ++-
 ext/oj/parse.c    |  6 ++++--
 lib/oj/version.rb |  2 +-
 metadata.yml      |  4 ++--
 9 files changed, 24 insertions(+), 20 deletions(-)

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