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)
commit9cc780391b13226b8a521f214dab18edf388468d
tree927dabb58904539707f29bf304cba01a18e654af
parent5dfbfc1e75ffe476b80a3de65b71bfb2ba8e753b
parente709abee7095bc61f16b1292ef0e1ccaf82a1adb
Automated merge with ssh://team@pocoo.org/jinja2-main

--HG--
branch : trunk