From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Thu, 7 Jul 2011 13:42:55 +0000 (+0200)
Subject: Merge branch 'master' of github.com:mitsuhiko/jinja2
X-Git-Tag: 2.6~5
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8a05e937cca3f5da09e482adb9821e3fb266b6cc;p=jinja2.git

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

8a05e937cca3f5da09e482adb9821e3fb266b6cc