tree 38e319729af209abde46b2ac04cb3d1c9446112b
parent d55ab53cf7c446fb7f471b81b66582bcf1dfd924
parent f9f029cd948438418599de600152ec3a4dab3af3
author Armin Ronacher <armin.ronacher@active-4.com> 1207750458 +0200
committer Armin Ronacher <armin.ronacher@active-4.com> 1207750458 +0200

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

--HG--
branch : trunk