Automated merge with ssh://team@pocoo.org/jinja2-main
authorArmin Ronacher <armin.ronacher@active-4.com>
Sun, 25 Oct 2009 11:46:41 +0000 (12:46 +0100)
committerArmin Ronacher <armin.ronacher@active-4.com>
Sun, 25 Oct 2009 11:46:41 +0000 (12:46 +0100)
commit6e249a0c09e888aee7785e8918a9baabe31016ff
treeb2638126d295cddd3615b79dfa02bbdc34cb97c7
parent79cc8d1640e691f6e0e23f96e509691f9167c66c
parent74230e6a386f077dd446a7dd3bf329c078e602ad
Automated merge with ssh://team@pocoo.org/jinja2-main

--HG--
branch : trunk