projects / jinja2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f49f8f7 a092a78)
Merged
authorArmin Ronacher <armin.ronacher@active-4.com>
Mon, 4 May 2009 06:39:23 +0000 (08:39 +0200)
committerArmin Ronacher <armin.ronacher@active-4.com>
Mon, 4 May 2009 06:39:23 +0000 (08:39 +0200)
--HG--
branch : trunk


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