projects / jinja2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1161915 7269991)
Merge branch 'master' of github.com:mitsuhiko/jinja2
authorArmin Ronacher <armin.ronacher@active-4.com>
Thu, 15 Dec 2011 10:50:59 +0000 (11:50 +0100)
committerArmin Ronacher <armin.ronacher@active-4.com>
Thu, 15 Dec 2011 10:50:59 +0000 (11:50 +0100)

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