Automated merge with ssh://team@pocoo.org/jinja2-main
authorArmin Ronacher <armin.ronacher@active-4.com>
Tue, 8 Apr 2008 21:20:22 +0000 (23:20 +0200)
committerArmin Ronacher <armin.ronacher@active-4.com>
Tue, 8 Apr 2008 21:20:22 +0000 (23:20 +0200)
commit149aa4eea904488c659d5af7da03ae7d65567908
treefef54d8a6dc3446c635d343e9e68f29f7905713c
parent671594bd7b0bd59f158e91f962f4c55b4e1a2ce6
parentca0666d874d7cb2d9aae2591bed88d50f96b95fb
Automated merge with ssh://team@pocoo.org/jinja2-main

--HG--
branch : trunk