Automated merge with http://dev.pocoo.org/hg/jinja2-main/
authorChristopher Grebs <entequak@googlemail.com>
Thu, 10 Jul 2008 09:52:37 +0000 (11:52 +0200)
committerChristopher Grebs <entequak@googlemail.com>
Thu, 10 Jul 2008 09:52:37 +0000 (11:52 +0200)
commit968ad5a681e451f02259015f5d05e8db0c611d72
tree1b3c74e940415511f1554866ad67093e67290758
parenta0e3ac02a50897d6436029e46662687290babb79
parentf1c940f13389f23e1d7ddba6bc70c3ad379d2840
Automated merge with dev.pocoo.org/hg/jinja2-main/

--HG--
branch : trunk
jinja2/environment.py