Automated merge with ssh://team@pocoo.org/jinja2-main
authorArmin Ronacher <armin.ronacher@active-4.com>
Sat, 12 Jul 2008 05:27:02 +0000 (07:27 +0200)
committerArmin Ronacher <armin.ronacher@active-4.com>
Sat, 12 Jul 2008 05:27:02 +0000 (07:27 +0200)
commit80b789545b6deef3a9eacf514a1babfecfbfe517
treeaae0aa7202ee857e97c0196132422a670eac1b87
parent76f9aa4b8653cc8519e90f4962c0bb07ab7d4938
parent968ad5a681e451f02259015f5d05e8db0c611d72
Automated merge with ssh://team@pocoo.org/jinja2-main

--HG--
branch : trunk