projects / jinja2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3b336c8 c7e6c6d)
merged.
authorArmin Ronacher <armin.ronacher@active-4.com>
Sun, 26 Jul 2009 08:39:17 +0000 (10:39 +0200)
committerArmin Ronacher <armin.ronacher@active-4.com>
Sun, 26 Jul 2009 08:39:17 +0000 (10:39 +0200)
--HG--
branch : trunk


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