projects / jinja2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ee352ec e37f697)
Merge branch 'master' of github.com:mitsuhiko/jinja2
authorArmin Ronacher <armin.ronacher@active-4.com>
Tue, 24 May 2011 14:40:38 +0000 (16:40 +0200)
committerArmin Ronacher <armin.ronacher@active-4.com>
Tue, 24 May 2011 14:40:38 +0000 (16:40 +0200)

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