[DRE-commits] [ruby-multi-json] 01/02: Merge tag 'upstream/1.11.0'

[Lucas Nussbaum]

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

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

commit 03c0d46e8dd8d444e6a1b3d52eae5c188f4dbd91
Merge: 704518e a3bb2b2
Author: Lucas Nussbaum <lucas at debian.org>
Date:   Wed May 6 21:18:02 2015 +0200

    Merge tag 'upstream/1.11.0'
    
    Upstream version 1.11.0

 .gitignore                                     |  36 +++++++
 .travis.yml                                    |   6 +-
 CHANGELOG.md                                   |   7 +-
 certs/rwz.pem                                  |  21 ++++
 certs/sferik.pem                               |  20 ++++
 checksums.yaml.gz                              | Bin 268 -> 0 bytes
 checksums.yaml.gz.sig                          | Bin 256 -> 0 bytes
 data.tar.gz.sig                                | Bin 256 -> 0 bytes
 lib/multi_json/adapter.rb                      |   1 +
 lib/multi_json/adapters/gson.rb                |   1 -
 lib/multi_json/adapters/json_common.rb         |   2 -
 lib/multi_json/adapters/nsjsonserialization.rb |   1 -
 lib/multi_json/adapters/ok_json.rb             |   1 -
 lib/multi_json/version.rb                      |   4 +-
 metadata.gz.sig                                |   2 -
 metadata.yml                                   | 142 -------------------------
 multi_json.gemspec                             |  28 +++--
 spec/shared/adapter.rb                         |   1 -
 18 files changed, 103 insertions(+), 170 deletions(-)

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