Merge branch '2.9-maintenance'

author Armin Ronacher <armin.ronacher@active-4.com>

Sun, 8 Jan 2017 14:39:25 +0000 (15:39 +0100)

committer Armin Ronacher <armin.ronacher@active-4.com>

Sun, 8 Jan 2017 14:39:25 +0000 (15:39 +0100)
author Armin Ronacher <armin.ronacher@active-4.com>
Sun, 8 Jan 2017 14:39:25 +0000 (15:39 +0100)
committer Armin Ronacher <armin.ronacher@active-4.com>
Sun, 8 Jan 2017 14:39:25 +0000 (15:39 +0100)
diff --cc CHANGES
Simple merge
diff --cc jinja2/compiler.py
Simple merge
diff --cc jinja2/idtracking.py
Simple merge
diff --cc jinja2/nodes.py
Simple merge
diff --cc tests/test_ext.py
Simple merge
author	Armin Ronacher <armin.ronacher@active-4.com>
	Sun, 8 Jan 2017 14:39:25 +0000 (15:39 +0100)
committer	Armin Ronacher <armin.ronacher@active-4.com>
	Sun, 8 Jan 2017 14:39:25 +0000 (15:39 +0100)
		1	2
CHANGES	patch \|	diff1 \|	diff2 \|	blob \| history
jinja2/compiler.py	patch \|	diff1 \|	diff2 \|	blob \| history
jinja2/idtracking.py	patch \|	diff1 \|	diff2 \|	blob \| history
jinja2/nodes.py	patch \|	diff1 \|	diff2 \|	blob \| history
tests/test_ext.py	patch \|	diff1 \|	diff2 \|	blob \| history