From: Markus Unterwaditzer <markus@unterwaditzer.net>
Date: Mon, 6 Apr 2015 12:28:25 +0000 (+0200)
Subject: Merge branch 'override-codegen-context'
X-Git-Tag: 2.8~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bd93bf35111d73eb00ef6597a1ec002170c1cd87;p=thirdparty%2Fjinja.git

Merge branch 'override-codegen-context'
---

bd93bf35111d73eb00ef6597a1ec002170c1cd87