From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Sat, 18 May 2013 10:37:18 +0000 (-0700)
Subject: Merge pull request #213 from Lukasa/luk-sprint-branch
X-Git-Tag: 2.7~77
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=755b6b7e849862ff6e81ca22d09016b8940ce07d;p=thirdparty%2Fjinja.git

Merge pull request #213 from Lukasa/luk-sprint-branch

Sprint: Misc fixes.
---

755b6b7e849862ff6e81ca22d09016b8940ce07d