]> git.ipfire.org Git - thirdparty/jinja.git/commitdiff
Merge remote-tracking branch 'paradoxxxzero/include_fix'
authorArmin Ronacher <armin.ronacher@active-4.com>
Sun, 19 May 2013 12:25:43 +0000 (13:25 +0100)
committerArmin Ronacher <armin.ronacher@active-4.com>
Sun, 19 May 2013 12:25:43 +0000 (13:25 +0100)
1  2 
jinja2/compiler.py
jinja2/testsuite/imports.py

Simple merge
Simple merge