Automated merge with ssh://team@pocoo.org/jinja2-main
authorArmin Ronacher <armin.ronacher@active-4.com>
Mon, 9 Jun 2008 20:19:25 +0000 (22:19 +0200)
committerArmin Ronacher <armin.ronacher@active-4.com>
Mon, 9 Jun 2008 20:19:25 +0000 (22:19 +0200)
--HG--
branch : trunk


Trivial merge