projects / jinja2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e9e43bb 62f8a29)
Automated merge with ssh://dev.pocoo.org/jinja2-main
authorChristoph Hack <christoph@tux21b.org>
Sun, 13 Apr 2008 21:37:02 +0000 (23:37 +0200)
committerChristoph Hack <christoph@tux21b.org>
Sun, 13 Apr 2008 21:37:02 +0000 (23:37 +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