projects / jinja2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e68d4c6 02901a8)
Merge pull request #28 from alanhogan/patch-1
authorArmin Ronacher <armin.ronacher@active-4.com>
Sat, 7 May 2011 22:26:31 +0000 (15:26 -0700)
committerArmin Ronacher <armin.ronacher@active-4.com>
Sat, 7 May 2011 22:26:31 +0000 (15:26 -0700)
Clarity


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