From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Sun, 17 Oct 2010 14:02:23 +0000 (+0200)
Subject: Merge branch '2.5-maintenance'
X-Git-Tag: 2.6~58
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f2cd943c03f2503ca71c4841a542791391cc6eae;p=jinja2.git

Merge branch '2.5-maintenance'
---

f2cd943c03f2503ca71c4841a542791391cc6eae