projects / jinja2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7d268be cd95414)
Merge pull request #80 from joshmoore/master
authorArmin Ronacher <armin.ronacher@active-4.com>
Wed, 14 Dec 2011 16:17:27 +0000 (08:17 -0800)
committerArmin Ronacher <armin.ronacher@active-4.com>
Wed, 14 Dec 2011 16:17:27 +0000 (08:17 -0800)
Minor typo fix under docs/


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