[DRE-commits] [ruby-json] 01/02: Merge tag 'upstream/1.8.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-json.

commit 5ffe704d8a13c2fe10ee94aeba153934c6e6bc30
Merge: fc34d2e a41fac6
Author: Cédric Boutillier <boutil at debian.org>
Date:   Sun Jun 21 07:31:20 2015 +0200

    Merge tag 'upstream/1.8.3'
    
    Upstream version 1.8.3
    
    # gpg: Signature made dim. 21 juin 2015 07:31:19 CEST using RSA key ID 39CD217A
    # gpg: Good signature from "Cédric Boutillier <boutil at debian.org>"
    # gpg:                 aka "Cédric Boutillier <cedric.boutillier at upmc.fr>"
    # gpg:                 aka "Cédric Boutillier <cedric.boutillier at polytechnique.org>"
    # gpg:                 aka "Cédric Boutillier <cedric.boutillier at gmail.com>"

 .travis.yml                        |   2 +
 CHANGES                            |   2 +
 README.rdoc                        |   6 +--
 VERSION                            |   2 +-
 ext/json/ext/generator/generator.c |  12 ++---
 ext/json/ext/generator/generator.h |  14 ++++--
 ext/json/ext/parser/parser.c       |  89 +++++++++++++++++--------------------
 ext/json/ext/parser/parser.h       |  14 ++++--
 ext/json/ext/parser/parser.rl      |  25 ++++-------
 json.gemspec                       | Bin 5008 -> 5008 bytes
 json_pure.gemspec                  |   8 ++--
 lib/json/version.rb                |   2 +-
 metadata.yml                       |   6 +--
 13 files changed, 91 insertions(+), 91 deletions(-)

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