Issue #26512: Merge rounding doc from 3.5

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

Sun, 8 May 2016 12:34:58 +0000 (12:34 +0000)

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

Sun, 8 May 2016 12:34:58 +0000 (12:34 +0000)
author Martin Panter <vadmium+py@gmail.com>
Sun, 8 May 2016 12:34:58 +0000 (12:34 +0000)
committer Martin Panter <vadmium+py@gmail.com>
Sun, 8 May 2016 12:34:58 +0000 (12:34 +0000)
diff --cc Doc/library/stdtypes.rst
Simple merge
diff --cc Modules/mathmodule.c
Simple merge
author	Martin Panter <vadmium+py@gmail.com>
	Sun, 8 May 2016 12:34:58 +0000 (12:34 +0000)
committer	Martin Panter <vadmium+py@gmail.com>
	Sun, 8 May 2016 12:34:58 +0000 (12:34 +0000)
		1	2
Doc/library/stdtypes.rst	patch \|	diff1 \|	diff2 \|	blob \| history
Modules/mathmodule.c	patch \|	diff1 \|	diff2 \|	blob \| history