projects / jinja2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0949e4d e3ec72c)
merged
authorArmin Ronacher <armin.ronacher@active-4.com>
Sun, 7 Oct 2007 16:54:45 +0000 (18:54 +0200)
committerArmin Ronacher <armin.ronacher@active-4.com>
Sun, 7 Oct 2007 16:54:45 +0000 (18:54 +0200)
--HG--
branch : trunk


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