Resolved conflict
authorArmin Ronacher <armin.ronacher@active-4.com>
Thu, 16 Apr 2009 21:17:43 +0000 (23:17 +0200)
committerArmin Ronacher <armin.ronacher@active-4.com>
Thu, 16 Apr 2009 21:17:43 +0000 (23:17 +0200)
commitf2b59c459c3dd51892fdaa7a47082c2d7a0876a3
treec8f9ad9447976ff1598d1a1ce0047668f89d0c2d
parent2a791926b9d69c02f54c10a62c4c1ce5e6ac40ab
parent32ed6c91fbab6c4b9fdd9cc2e57db9911bc45d79
Resolved conflict

--HG--
branch : trunk
jinja2/debug.py
jinja2/environment.py