projects / jinja2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ff115c4 b523c93)
Merge branch 'master' of github.com:mitsuhiko/jinja2
authorArmin Ronacher <armin.ronacher@active-4.com>
Thu, 7 Jul 2011 13:42:55 +0000 (15:42 +0200)
committerArmin Ronacher <armin.ronacher@active-4.com>
Thu, 7 Jul 2011 13:42:55 +0000 (15:42 +0200)

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