Issue #27993: Merge plural fixes from 3.5

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

Wed, 7 Sep 2016 23:36:43 +0000 (23:36 +0000)

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

Wed, 7 Sep 2016 23:36:43 +0000 (23:36 +0000)
author Martin Panter <vadmium+py@gmail.com>
Wed, 7 Sep 2016 23:36:43 +0000 (23:36 +0000)
committer Martin Panter <vadmium+py@gmail.com>
Wed, 7 Sep 2016 23:36:43 +0000 (23:36 +0000)
diff --cc Lib/inspect.py
Simple merge
diff --cc Misc/NEWS
Simple merge
author	Martin Panter <vadmium+py@gmail.com>
	Wed, 7 Sep 2016 23:36:43 +0000 (23:36 +0000)
committer	Martin Panter <vadmium+py@gmail.com>
	Wed, 7 Sep 2016 23:36:43 +0000 (23:36 +0000)
		1	2
Lib/inspect.py	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history