Automated merge with ssh://team@pocoo.org/jinja2-main
authorArmin Ronacher <armin.ronacher@active-4.com>
Tue, 7 Jul 2009 11:22:44 +0000 (13:22 +0200)
committerArmin Ronacher <armin.ronacher@active-4.com>
Tue, 7 Jul 2009 11:22:44 +0000 (13:22 +0200)
commit0e4284b546cfc8d4806c7d757f3669058de46a57
treed2588f684986218ab9051d6a83825af656199d92
parenta092a786444bb285045737e4d782fc7a80233944
parentdb19b3045e1475766a78b0c9762a4f11e34d1bbf
Automated merge with ssh://team@pocoo.org/jinja2-main

--HG--
branch : trunk