projects / jinja2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 61a3d31 5829306)
Automated merge with ssh://team@pocoo.org/jinja-main
authorArmin Ronacher <armin.ronacher@active-4.com>
Tue, 25 Mar 2008 13:36:41 +0000 (14:36 +0100)
committerArmin Ronacher <armin.ronacher@active-4.com>
Tue, 25 Mar 2008 13:36:41 +0000 (14:36 +0100)
--HG--
branch : trunk


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