From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Sat, 28 Jan 2017 14:44:17 +0000 (+0100)
Subject: Merge branch '2.9-maintenance'
X-Git-Tag: 2.10~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=921eb81d2edbf15d4469cd89424b8eaf9579bf59;p=thirdparty%2Fjinja.git

Merge branch '2.9-maintenance'
---

921eb81d2edbf15d4469cd89424b8eaf9579bf59
diff --cc CHANGES
index 2b624b3a,fb14601e..383e1a7c
--- a/CHANGES
+++ b/CHANGES
@@@ -1,19 -1,9 +1,19 @@@
  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.
 +- Added an `in` test that works like the in operator.  This can be used
 +  in combination with `reject` and `select`.
 +
  Version 2.9.5
  -------------
- (bugfix release, no release date yet)
+ (bugfix release, released on January 28th 2017)
  
  - Restored the original repr of the internal `_GroupTuple` because this
    caused issues with ansible and it was an unintended change.  (#654)