Merge 3.5 (issue #25660)

author Yury Selivanov <yselivanov@sprymix.com>

Thu, 4 Feb 2016 06:24:56 +0000 (01:24 -0500)

committer Yury Selivanov <yselivanov@sprymix.com>

Thu, 4 Feb 2016 06:24:56 +0000 (01:24 -0500)
author Yury Selivanov <yselivanov@sprymix.com>
Thu, 4 Feb 2016 06:24:56 +0000 (01:24 -0500)
committer Yury Selivanov <yselivanov@sprymix.com>
Thu, 4 Feb 2016 06:24:56 +0000 (01:24 -0500)
diff --cc Lib/rlcompleter.py
Simple merge
diff --cc Misc/NEWS
Simple merge
author	Yury Selivanov <yselivanov@sprymix.com>
	Thu, 4 Feb 2016 06:24:56 +0000 (01:24 -0500)
committer	Yury Selivanov <yselivanov@sprymix.com>
	Thu, 4 Feb 2016 06:24:56 +0000 (01:24 -0500)
		1	2
Lib/rlcompleter.py	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history