projects / jinja2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 79cc8d1 74230e6)
Automated merge with ssh://team@pocoo.org/jinja2-main
authorArmin Ronacher <armin.ronacher@active-4.com>
Sun, 25 Oct 2009 11:46:41 +0000 (12:46 +0100)
committerArmin Ronacher <armin.ronacher@active-4.com>
Sun, 25 Oct 2009 11:46:41 +0000 (12:46 +0100)
--HG--
branch : trunk


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