From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Thu, 15 Dec 2011 10:50:59 +0000 (+0100)
Subject: Merge branch 'master' of github.com:mitsuhiko/jinja2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=80b4fe6159a31fe3752b659785c0c75ce3af2ef3;p=jinja2.git

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

80b4fe6159a31fe3752b659785c0c75ce3af2ef3