Merge 3.5 (issue #25888)

author Yury Selivanov <yselivanov@sprymix.com>

Wed, 2 Mar 2016 16:31:06 +0000 (11:31 -0500)

committer Yury Selivanov <yselivanov@sprymix.com>

Wed, 2 Mar 2016 16:31:06 +0000 (11:31 -0500)
author Yury Selivanov <yselivanov@sprymix.com>
Wed, 2 Mar 2016 16:31:06 +0000 (11:31 -0500)
committer Yury Selivanov <yselivanov@sprymix.com>
Wed, 2 Mar 2016 16:31:06 +0000 (11:31 -0500)
diff --cc Objects/genobject.c
Simple merge
diff --cc Python/ceval.c
Simple merge
author	Yury Selivanov <yselivanov@sprymix.com>
	Wed, 2 Mar 2016 16:31:06 +0000 (11:31 -0500)
committer	Yury Selivanov <yselivanov@sprymix.com>
	Wed, 2 Mar 2016 16:31:06 +0000 (11:31 -0500)
		1	2
Objects/genobject.c	patch \|	diff1 \|	diff2 \|	blob \| history
Python/ceval.c	patch \|	diff1 \|	diff2 \|	blob \| history