projects / jinja2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a092a78 db19b30)
Automated merge with ssh://team@pocoo.org/jinja2-main
authorArmin Ronacher <armin.ronacher@active-4.com>
Tue, 7 Jul 2009 11:22:44 +0000 (13:22 +0200)
committerArmin Ronacher <armin.ronacher@active-4.com>
Tue, 7 Jul 2009 11:22:44 +0000 (13:22 +0200)
--HG--
branch : trunk


Trivial merge
The Jinja2 template engine, with 2to3 already run