[Python-modules-commits] [python-demjson] 03/08: Merge tag 'upstream/2.2.3'

[Takaki Taniguchi]

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

takaki pushed a commit to branch master
in repository python-demjson.

commit 2baf7ee4b7fc949222470a8ada49a23858e1bcda
Merge: 9532840 e4e2b51
Author: TANIGUCHI Takaki <takaki at asis.media-as.org>
Date:   Wed Nov 25 20:15:29 2015 +0900

    Merge tag 'upstream/2.2.3'
    
    Upstream version 2.2.3
    
    # gpg: 2015年11月25日 20時15分29秒 JSTにRSA鍵ID 28A5E257で施された署名
    # gpg: “TANIGUCHI Takaki <takaki at media-as.org>”からの正しい署名
    # gpg:                 別名“TANIGUCHI Takaki <takaki at asis.media-as.org>”
    # gpg:                 別名“TANIGUCHI Takaki <taniguchi.takaki at gmail.com>”
    # gpg:                 別名“TANIGUCHI Takaki <takaki at debian.org>”
    # gpg:                 別名“TANIGUCHI Takaki <takaki at debian.or.jp>”
    # gpg:                 別名“TANIGUCHI Takaki <takaki at takaki.media-as.org>”
    # gpg:                 別名“TANIGUCHI Takaki <takaki at nagoya-u.jp>”

 PKG-INFO             |  4 ++--
 README.md            |  4 ++++
 demjson.py           | 26 +++++++++++++++-----------
 docs/CHANGES.txt     | 14 +++++++++++++-
 docs/NEWS.txt        |  1 +
 docs/demjson.txt     | 14 +++++++-------
 jsonlint             |  4 ++--
 setup.py             |  2 +-
 test/test_demjson.py |  2 +-
 9 files changed, 46 insertions(+), 25 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-demjson.git