[DRE-commits] [ruby-multi-json] 02/03: Merge tag 'upstream/1.11.2'

[Antonio Terceiro]

This is an automated email from the git hooks/post-receive script.

terceiro pushed a commit to branch master
in repository ruby-multi-json.

commit c96cbe771589e4c2195b554c5ab9c855d947185c
Merge: 6686fbc 8138eb0
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Fri Aug 14 11:50:28 2015 -0300

    Merge tag 'upstream/1.11.2'
    
    Upstream version 1.11.2
    
    # gpg: Signature made Sex 14 Ago 2015 11:50:26 BRT using RSA key ID CD460BDE
    # gpg: Good signature from "Antonio Terceiro <terceiro at softwarelivre.org>"
    # gpg:                 aka "Antonio Terceiro <terceiro at dcc.ufba.br>"
    # gpg:                 aka "Antonio Terceiro <terceiro at colivre.coop.br>"
    # gpg:                 aka "Antonio Terceiro <terceiro at debian.org>"

 CHANGELOG.md                          | 10 ++++++++++
 Gemfile                               |  1 -
 lib/multi_json/adapters/jr_jackson.rb | 10 ++++++++--
 lib/multi_json/version.rb             |  2 +-
 spec/shared/adapter.rb                | 13 ++++++++++---
 5 files changed, 29 insertions(+), 7 deletions(-)

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