merge 3.3

author Benjamin Peterson <benjamin@python.org>

Fri, 1 Jan 2016 16:24:21 +0000 (10:24 -0600)

committer Benjamin Peterson <benjamin@python.org>

Fri, 1 Jan 2016 16:24:21 +0000 (10:24 -0600)
author Benjamin Peterson <benjamin@python.org>
Fri, 1 Jan 2016 16:24:21 +0000 (10:24 -0600)
committer Benjamin Peterson <benjamin@python.org>
Fri, 1 Jan 2016 16:24:21 +0000 (10:24 -0600)
diff --cc Doc/license.rst
Simple merge
diff --cc README
Simple merge
author	Benjamin Peterson <benjamin@python.org>
	Fri, 1 Jan 2016 16:24:21 +0000 (10:24 -0600)
committer	Benjamin Peterson <benjamin@python.org>
	Fri, 1 Jan 2016 16:24:21 +0000 (10:24 -0600)
		1	2
Doc/license.rst	patch \|	diff1 \|	diff2 \|	blob \| history
README	patch \|	diff1 \|	diff2 \|	blob \| history