From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Sat, 18 May 2013 11:10:40 +0000 (-0700)
Subject: Merge pull request #188 from lemonad/master
X-Git-Tag: 2.7~66^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=77e0fa2aecb5db68471785fe397c037911f0f889;p=thirdparty%2Fjinja.git

Merge pull request #188 from lemonad/master

Fixed typos: overriden to overridden
---

77e0fa2aecb5db68471785fe397c037911f0f889