Merge heads

author Serhiy Storchaka <storchaka@gmail.com>

Fri, 9 Sep 2016 22:14:38 +0000 (01:14 +0300)

committer Serhiy Storchaka <storchaka@gmail.com>

Fri, 9 Sep 2016 22:14:38 +0000 (01:14 +0300)
author Serhiy Storchaka <storchaka@gmail.com>
Fri, 9 Sep 2016 22:14:38 +0000 (01:14 +0300)
committer Serhiy Storchaka <storchaka@gmail.com>
Fri, 9 Sep 2016 22:14:38 +0000 (01:14 +0300)
diff --cc Doc/whatsnew/3.6.rst
Simple merge
diff --cc Misc/NEWS
Simple merge
author	Serhiy Storchaka <storchaka@gmail.com>
	Fri, 9 Sep 2016 22:14:38 +0000 (01:14 +0300)
committer	Serhiy Storchaka <storchaka@gmail.com>
	Fri, 9 Sep 2016 22:14:38 +0000 (01:14 +0300)
		1	2
Doc/whatsnew/3.6.rst	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history