Issue #28139: Merge indentation fixes from 3.5 into 3.6

author Martin Panter <vadmium+py@gmail.com>

Sat, 17 Sep 2016 07:59:14 +0000 (07:59 +0000)

committer Martin Panter <vadmium+py@gmail.com>

Sat, 17 Sep 2016 07:59:14 +0000 (07:59 +0000)
author Martin Panter <vadmium+py@gmail.com>
Sat, 17 Sep 2016 07:59:14 +0000 (07:59 +0000)
committer Martin Panter <vadmium+py@gmail.com>
Sat, 17 Sep 2016 07:59:14 +0000 (07:59 +0000)
diff --cc Include/unicodeobject.h
Simple merge
diff --cc Modules/_localemodule.c
Simple merge
diff --cc Modules/signalmodule.c
Simple merge
diff --cc Modules/socketmodule.c
Simple merge
diff --cc Objects/funcobject.c
Simple merge
diff --cc PC/bdist_wininst/install.c
Simple merge
author	Martin Panter <vadmium+py@gmail.com>
	Sat, 17 Sep 2016 07:59:14 +0000 (07:59 +0000)
committer	Martin Panter <vadmium+py@gmail.com>
	Sat, 17 Sep 2016 07:59:14 +0000 (07:59 +0000)
		1	2
Include/unicodeobject.h	patch \|	diff1 \|	diff2 \|	blob \| history
Modules/_localemodule.c	patch \|	diff1 \|	diff2 \|	blob \| history
Modules/signalmodule.c	patch \|	diff1 \|	diff2 \|	blob \| history
Modules/socketmodule.c	patch \|	diff1 \|	diff2 \|	blob \| history
Objects/funcobject.c	patch \|	diff1 \|	diff2 \|	blob \| history
PC/bdist_wininst/install.c	patch \|	diff1 \|	diff2 \|	blob \| history