]> git.ipfire.org Git - thirdparty/jinja.git/commitdiff
Merge remote-tracking branch 'apollo13/master'
authorArmin Ronacher <armin.ronacher@active-4.com>
Sun, 19 May 2013 11:45:48 +0000 (12:45 +0100)
committerArmin Ronacher <armin.ronacher@active-4.com>
Sun, 19 May 2013 11:45:48 +0000 (12:45 +0100)
1  2 
jinja2/ext.py
jinja2/testsuite/ext.py

diff --cc jinja2/ext.py
Simple merge
Simple merge