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)
commitf3d3d7b5f5d65161290dc3173a90513235b75c16
tree18a7b3008030d60d7cdbd56a5d2123725bfe7a7a
parent3111f43ffc37d543171417657f02fee3cc118b23
parentabfe3fb9e71a40027ec64e3f3907b6f696d76a56
Automated merge with ssh://team@pocoo.org/jinja2-main

--HG--
branch : trunk