projects / jinja2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bc3d2d8 9cdf3bf)
marged
authorArmin Ronacher <armin.ronacher@active-4.com>
Fri, 19 Oct 2007 13:51:28 +0000 (15:51 +0200)
committerArmin Ronacher <armin.ronacher@active-4.com>
Fri, 19 Oct 2007 13:51:28 +0000 (15:51 +0200)
--HG--
branch : trunk


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