Merge branch '2.9-maintenance'

author Adrian Moennich <adrian@planetcoding.net>

Tue, 22 Aug 2017 21:17:15 +0000 (23:17 +0200)

committer Adrian Moennich <adrian@planetcoding.net>

Tue, 22 Aug 2017 21:17:15 +0000 (23:17 +0200)
author Adrian Moennich <adrian@planetcoding.net>
Tue, 22 Aug 2017 21:17:15 +0000 (23:17 +0200)
committer Adrian Moennich <adrian@planetcoding.net>
Tue, 22 Aug 2017 21:17:15 +0000 (23:17 +0200)
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 jinja2/parser.py
Simple merge
diff --cc tests/test_core_tags.py
Simple merge
author	Adrian Moennich <adrian@planetcoding.net>
	Tue, 22 Aug 2017 21:17:15 +0000 (23:17 +0200)
committer	Adrian Moennich <adrian@planetcoding.net>
	Tue, 22 Aug 2017 21:17:15 +0000 (23:17 +0200)
		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
jinja2/parser.py	patch \|	diff1 \|	diff2 \|	blob \| history
tests/test_core_tags.py	patch \|	diff1 \|	diff2 \|	blob \| history