tree fef54d8a6dc3446c635d343e9e68f29f7905713c
parent 671594bd7b0bd59f158e91f962f4c55b4e1a2ce6
parent ca0666d874d7cb2d9aae2591bed88d50f96b95fb
author Armin Ronacher <armin.ronacher@active-4.com> 1207689622 +0200
committer Armin Ronacher <armin.ronacher@active-4.com> 1207689622 +0200

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

--HG--
branch : trunk