[Python-modules-commits] [python-demjson] 02/04: Merge tag 'upstream/2.2.4'

[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 29a564bdc2b1ba33727915218edd07ea61af8a35
Merge: 051c479 44257bf
Author: TANIGUCHI Takaki <takaki at asis.media-as.org>
Date:   Tue Feb 2 16:10:44 2016 +0900

    Merge tag 'upstream/2.2.4'
    
    Upstream version 2.2.4
    
    # gpg: 2016年02月02日 16時10分43秒 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        |  5 +++++
 demjson.py       | 13 ++++++++-----
 docs/CHANGES.txt |  7 +++++++
 docs/NEWS.txt    |  1 +
 docs/demjson.txt | 18 +++++++++---------
 jsonlint         |  6 +++---
 setup.py         |  2 +-
 8 files changed, 36 insertions(+), 20 deletions(-)

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