Automated merge with ssh://team@pocoo.org/jinja2-main
authorArmin Ronacher <armin.ronacher@active-4.com>
Tue, 8 Apr 2008 19:48:10 +0000 (21:48 +0200)
committerArmin Ronacher <armin.ronacher@active-4.com>
Tue, 8 Apr 2008 19:48:10 +0000 (21:48 +0200)
commit671594bd7b0bd59f158e91f962f4c55b4e1a2ce6
treec024a8a0b1da3a0a6fd8f1739bd468ceed367c18
parentecb839e21b8d283cdb15ff6f7407228fcf0ee93f
parent5af9c55a206129fab936f03a5fca2b1273cc6529
Automated merge with ssh://team@pocoo.org/jinja2-main

--HG--
branch : trunk