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)
--HG--
branch : trunk

1  2 
jinja2/environment.py

Simple merge