Automated merge with ssh://team@pocoo.org/jinja2-main
authorArmin Ronacher <armin.ronacher@active-4.com>
Mon, 28 Apr 2008 16:18:27 +0000 (18:18 +0200)
committerArmin Ronacher <armin.ronacher@active-4.com>
Mon, 28 Apr 2008 16:18:27 +0000 (18:18 +0200)
--HG--
branch : trunk

1  2 
jinja2/utils.py

diff --cc jinja2/utils.py
Simple merge