#16210: merge with 3.2.

author Ezio Melotti <ezio.melotti@gmail.com>

Wed, 24 Oct 2012 20:06:56 +0000 (23:06 +0300)

committer Ezio Melotti <ezio.melotti@gmail.com>

Wed, 24 Oct 2012 20:06:56 +0000 (23:06 +0300)
author Ezio Melotti <ezio.melotti@gmail.com>
Wed, 24 Oct 2012 20:06:56 +0000 (23:06 +0300)
committer Ezio Melotti <ezio.melotti@gmail.com>
Wed, 24 Oct 2012 20:06:56 +0000 (23:06 +0300)
diff --cc Doc/library/functions.rst
Simple merge
diff --cc Misc/ACKS

index f01619eee9b95cd9428fe1f6df28adadb7920116,182c6a6d67d5a07a1a5abe7dc2e0882c50531466..3ee38640a2423d2fc12ccf657f4c889621c8d57b
--- 1/Misc/ACKS
--- 2/Misc/ACKS
+++ b/Misc/ACKS
@@@ -1055,10 -956,10 +1055,11 @@@ Nick Seidenma
   Yury Selivanov
   Fred Sells
   Jiwon Seo
+ +Iñigo Serna
   Joakim Sernbrant
- -Roger Serwy
+ +Roger D. Serwy
   Jerry Seutter
+ Pete Sevander
   Denis Severson
   Ian Seyer
   Ha Shao
author	Ezio Melotti <ezio.melotti@gmail.com>
	Wed, 24 Oct 2012 20:06:56 +0000 (23:06 +0300)
committer	Ezio Melotti <ezio.melotti@gmail.com>
	Wed, 24 Oct 2012 20:06:56 +0000 (23:06 +0300)
		1	2
Doc/library/functions.rst	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/ACKS	patch \|	diff1 \|	diff2 \|	blob \| history