Automated merge with ssh://team@pocoo.org/jinja2-main
authorArmin Ronacher <armin.ronacher@active-4.com>
Sun, 21 Sep 2008 14:21:34 +0000 (16:21 +0200)
committerArmin Ronacher <armin.ronacher@active-4.com>
Sun, 21 Sep 2008 14:21:34 +0000 (16:21 +0200)
commit5799605a1e6d0a944ad98d30f8a2dd46d8aaef9c
treecb61d7f0cfff3d1d67049fcd5cd8857059f75e4a
parent9a7306e1a3e602681606d26a198fbae3bb1c8ee1
parent3e497b7ad8605267c8116db70c95dd9f369e9076
Automated merge with ssh://team@pocoo.org/jinja2-main

--HG--
branch : trunk