[Python-modules-commits] [python-kajiki] 03/06: Merge tag 'upstream/0.5.2'

[Takaki Taniguchi]

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

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

commit af2e9f5d3c8bf742b68a96e84d0923bf17fb1a29
Merge: 98d0221 bafb487
Author: TANIGUCHI Takaki <takaki at asis.media-as.org>
Date:   Wed Nov 25 22:49:29 2015 +0900

    Merge tag 'upstream/0.5.2'
    
    Upstream version 0.5.2
    
    # gpg: 2015年11月25日 22時49分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>”

 CHANGES.rst                 |  19 +++++++
 Kajiki.egg-info/PKG-INFO    |  23 ++++++++-
 Kajiki.egg-info/SOURCES.txt |   1 +
 Kajiki.egg-info/pbr.json    |   1 +
 PKG-INFO                    |  23 ++++++++-
 README.rst                  |   2 +
 kajiki/i18n.py              |   7 ++-
 kajiki/ir.py                |  30 +++++------
 kajiki/loader.py            |   8 +--
 kajiki/template.py          |   2 +-
 kajiki/tests/test_xml.py    | 118 ++++++++++++++++++++++++++++++++++++++++++--
 kajiki/version.py           |   4 +-
 kajiki/xml_template.py      |  75 +++++++++++++++++++++++-----
 13 files changed, 272 insertions(+), 41 deletions(-)

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