Automated merge with ssh://team@pocoo.org/jinja2-main
authorArmin Ronacher <armin.ronacher@active-4.com>
Wed, 9 Apr 2008 14:14:18 +0000 (16:14 +0200)
committerArmin Ronacher <armin.ronacher@active-4.com>
Wed, 9 Apr 2008 14:14:18 +0000 (16:14 +0200)
commitcb3bd65e0624fae054b6ff1b479c0ba730ca5649
tree38e319729af209abde46b2ac04cb3d1c9446112b
parentd55ab53cf7c446fb7f471b81b66582bcf1dfd924
parentf9f029cd948438418599de600152ec3a4dab3af3
Automated merge with ssh://team@pocoo.org/jinja2-main

--HG--
branch : trunk
jinja2/runtime.py