From: Christoph Hack <christoph@tux21b.org>
Date: Wed, 9 Apr 2008 11:56:30 +0000 (+0200)
Subject: merged
X-Git-Tag: 2.0rc1~198^2~1
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=bfe7a6bb01499b7d8a9b3fd3ba7f7854856de3a5;p=jinja2.git

merged

--HG--
branch : trunk
---

bfe7a6bb01499b7d8a9b3fd3ba7f7854856de3a5