projects / jinja2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d55ab53 f9f029c)
Automated merge with ssh://team@pocoo.org/jinja2-main
authorArmin Ronacher <armin.ronacher@active-4.com>
Wed, 9 Apr 2008 14:14:18 +0000 (16:14 +0200)
committerArmin Ronacher <armin.ronacher@active-4.com>
Wed, 9 Apr 2008 14:14:18 +0000 (16:14 +0200)
--HG--
branch : trunk

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

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