projects / jinja2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2966f17 086dc7b)
Merged in changes from 2.3.1
authorArmin Ronacher <armin.ronacher@active-4.com>
Wed, 17 Feb 2010 07:02:52 +0000 (08:02 +0100)
committerArmin Ronacher <armin.ronacher@active-4.com>
Wed, 17 Feb 2010 07:02:52 +0000 (08:02 +0100)
--HG--
branch : trunk


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