merge 3.3

author Benjamin Peterson <benjamin@python.org>

Mon, 2 Jan 2017 04:07:37 +0000 (22:07 -0600)

committer Benjamin Peterson <benjamin@python.org>

Mon, 2 Jan 2017 04:07:37 +0000 (22:07 -0600)
author Benjamin Peterson <benjamin@python.org>
Mon, 2 Jan 2017 04:07:37 +0000 (22:07 -0600)
committer Benjamin Peterson <benjamin@python.org>
Mon, 2 Jan 2017 04:07:37 +0000 (22:07 -0600)
diff --cc Doc/license.rst
Simple merge
diff --cc Mac/Resources/app/Info.plist.in
Simple merge
diff --cc README
Simple merge
author	Benjamin Peterson <benjamin@python.org>
	Mon, 2 Jan 2017 04:07:37 +0000 (22:07 -0600)
committer	Benjamin Peterson <benjamin@python.org>
	Mon, 2 Jan 2017 04:07:37 +0000 (22:07 -0600)
		1	2
Doc/license.rst	patch \|	diff1 \|	diff2 \|	blob \| history
Mac/Resources/app/Info.plist.in	patch \|	diff1 \|	diff2 \|	blob \| history
README	patch \|	diff1 \|	diff2 \|	blob \| history