projects / jinja2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a80d2f5 2004449)
Merge pull request #41 from andymckay/master
authorArmin Ronacher <armin.ronacher@active-4.com>
Thu, 30 Jun 2011 21:42:01 +0000 (14:42 -0700)
committerArmin Ronacher <armin.ronacher@active-4.com>
Thu, 30 Jun 2011 21:42:01 +0000 (14:42 -0700)
typo?


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