From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Mon, 3 Apr 2017 13:12:08 +0000 (+0200)
Subject: Merge branch '2.9-maintenance'
X-Git-Tag: 2.10~32
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c1cd154278cc5f9054ef26e218c226a847216f4b;p=thirdparty%2Fjinja.git

Merge branch '2.9-maintenance'
---

c1cd154278cc5f9054ef26e218c226a847216f4b
diff --cc CHANGES
index 383e1a7c,967b40aa..9550fa46
--- a/CHANGES
+++ b/CHANGES
@@@ -1,16 -1,12 +1,22 @@@
  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.6
+ -------------
+ (bugfix release, released on April 3rd 2017)
+ 
+ - Fixed custom context behavior in fast resolve mode (#675)
+ 
  Version 2.9.5
  -------------
  (bugfix release, released on January 28th 2017)
diff --cc setup.py
index b77ff428,6fc71396..ac2f5095
--- a/setup.py
+++ b/setup.py
@@@ -40,7 -40,7 +40,11 @@@ from setuptools import setu
  
  setup(
      name='Jinja2',
++<<<<<<< HEAD
 +    version='2.10.dev',
++=======
+     version='2.9.7.dev',
++>>>>>>> 2.9-maintenance
      url='http://jinja.pocoo.org/',
      license='BSD',
      author='Armin Ronacher',