Automated merge with ssh://team@pocoo.org/jinja2-main
authorArmin Ronacher <armin.ronacher@active-4.com>
Tue, 8 Apr 2008 19:48:10 +0000 (21:48 +0200)
committerArmin Ronacher <armin.ronacher@active-4.com>
Tue, 8 Apr 2008 19:48:10 +0000 (21:48 +0200)
--HG--
branch : trunk


Trivial merge