tree c024a8a0b1da3a0a6fd8f1739bd468ceed367c18
parent ecb839e21b8d283cdb15ff6f7407228fcf0ee93f
parent 5af9c55a206129fab936f03a5fca2b1273cc6529
author Armin Ronacher <armin.ronacher@active-4.com> 1207684090 +0200
committer Armin Ronacher <armin.ronacher@active-4.com> 1207684090 +0200

Automated merge with ssh://team@pocoo.org/jinja2-main

--HG--
branch : trunk