projects / jinja2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a0e3ac0 f1c940f)
Automated merge with http://dev.pocoo.org/hg/jinja2-main/
authorChristopher Grebs <entequak@googlemail.com>
Thu, 10 Jul 2008 09:52:37 +0000 (11:52 +0200)
committerChristopher Grebs <entequak@googlemail.com>
Thu, 10 Jul 2008 09:52:37 +0000 (11:52 +0200)
--HG--
branch : trunk

1  2 
jinja2/environment.py patch | diff1 | diff2 | blob | history

diff --cc jinja2/environment.py
Simple merge
The Jinja2 template engine, with 2to3 already run