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


Trivial merge