tree 441930a8caf0b1ef3082169dca315bfa0366d8c8
parent 4dfc975c341e09dfca5ff826ec68029831e3e1d6
parent ca12b71d240d8559ce986b1aa131cc51ff94f0b2
author Armin Ronacher <armin.ronacher@active-4.com> 1207746213 +0200
committer Armin Ronacher <armin.ronacher@active-4.com> 1207746213 +0200

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

--HG--
branch : trunk