]> git.ipfire.org Git - thirdparty/jinja.git/commitdiff
Merge branch 'pr/267'
authorArmin Ronacher <armin.ronacher@active-4.com>
Thu, 12 Dec 2013 22:27:53 +0000 (22:27 +0000)
committerArmin Ronacher <armin.ronacher@active-4.com>
Thu, 12 Dec 2013 22:27:53 +0000 (22:27 +0000)
1  2 
jinja2/filters.py
jinja2/testsuite/filters.py

Simple merge
Simple merge