[Python-modules-commits] [python-kajiki] 02/04: Merge tag 'upstream/0.5.3'

[Takaki Taniguchi]

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

takaki pushed a commit to annotated tag debian/0.5.3-1
in repository python-kajiki.

commit 1a96e350de975fda9d95d13875f096940a17c0df
Merge: 05c5735 76c55fc
Author: TANIGUCHI Takaki <takaki at asis.media-as.org>
Date:   Tue Feb 2 16:17:21 2016 +0900

    Merge tag 'upstream/0.5.3'
    
    Upstream version 0.5.3
    
    # gpg: 2016年02月02日 16時17分21秒 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>"

 CHANGES.rst                  |  6 ++++++
 Kajiki.egg-info/PKG-INFO     |  8 +++++++-
 Kajiki.egg-info/requires.txt |  3 +--
 PKG-INFO                     |  8 +++++++-
 kajiki/ir.py                 | 41 ++++++++++++++++++++++++++---------------
 kajiki/template.py           |  6 ++----
 kajiki/tests/test_xml.py     | 17 +++++++++++++++++
 kajiki/util.py               | 11 +++++++++++
 kajiki/version.py            |  2 +-
 setup.py                     |  2 +-
 10 files changed, 79 insertions(+), 25 deletions(-)

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