Automated merge with ssh://team@pocoo.org/jinja2-main
authorArmin Ronacher <armin.ronacher@active-4.com>
Tue, 7 Jul 2009 11:22:44 +0000 (13:22 +0200)
committerArmin Ronacher <armin.ronacher@active-4.com>
Tue, 7 Jul 2009 11:22:44 +0000 (13:22 +0200)
--HG--
branch : trunk


Trivial merge