Automated merge with ssh://dev.pocoo.org/jinja2-main
authorChristoph Hack <christoph@tux21b.org>
Sun, 13 Apr 2008 21:37:02 +0000 (23:37 +0200)
committerChristoph Hack <christoph@tux21b.org>
Sun, 13 Apr 2008 21:37:02 +0000 (23:37 +0200)
commit4f11d740b19801468cfc62197624373598103750
tree7123b1e50ab7228a4fc2b3f224bd741409e0c439
parente9e43bbabc4e98c4e6f2add5f02f17ae69068cfd
parent62f8a2984c8b2ffc712ae7bbed6cf4e59eaa2dbe
Automated merge with ssh://dev.pocoo.org/jinja2-main

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