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

Merge branch '2.5-maintenance'
---

91f7fefbcbfc676a2a97b7aa6d71fbeeadada606