From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Tue, 10 Jan 2017 08:24:55 +0000 (+0100)
Subject: Merge branch '2.9-maintenance'
X-Git-Tag: 2.10~49
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4e7fd1a521223c6627cfcd02db48a8e1765079ca;p=thirdparty%2Fjinja.git

Merge branch '2.9-maintenance'
---

4e7fd1a521223c6627cfcd02db48a8e1765079ca
diff --cc CHANGES
index 70570c7c,f95f41a4..af3eb381
--- a/CHANGES
+++ b/CHANGES
@@@ -1,17 -1,9 +1,17 @@@
  Jinja2 Changelog
  ================
  
 +Version 2.10
 +------------
 +(feature release, release date to be decided)
 +
 +- Added a new extension node called `OverlayScope` which can be used to
 +  create an unoptimized scope that will look up all variables from a
 +  derived context.
 +
  Version 2.9.4
  -------------
- (unreleased bugfix release)
+ (bugfix release, released on January 10th 2017)
  
  - Solved some warnings for string literals.  (#646)
  - Increment the bytecode cache version which was not done due to an