From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Tue, 24 May 2011 14:40:38 +0000 (+0200)
Subject: Merge branch 'master' of github.com:mitsuhiko/jinja2
X-Git-Tag: 2.6~10
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d01d34b1a127432f4e42fce7cd7bbb3f17cf10ad;p=jinja2.git

Merge branch 'master' of github.com:mitsuhiko/jinja2
---

d01d34b1a127432f4e42fce7cd7bbb3f17cf10ad