]> git.ipfire.org Git - thirdparty/jinja.git/commit
Merge branch 'master' into sprint-branch
authorArmin Ronacher <armin.ronacher@active-4.com>
Sat, 18 May 2013 10:58:37 +0000 (11:58 +0100)
committerArmin Ronacher <armin.ronacher@active-4.com>
Sat, 18 May 2013 10:58:37 +0000 (11:58 +0100)
commitadb599994a668520b6467d7e2265d2150106eceb
tree76d2799b1071573bb0faff7af4d8ff1db78902bb
parent0c435ccb3807db0f18845cdc8436c924bf7cf625
parent9962c10b258472d7e07ec4d447d21fcee9d998c2
Merge branch 'master' into sprint-branch
CHANGES
jinja2/runtime.py
jinja2/testsuite/regression.py