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

Merge branch '2.5-maintenance'
---

0e7b9f0bbc1c14b66225fb3863e1cf1a17a0b90d