#16549: merge with 3.2.

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

Thu, 29 Nov 2012 00:16:58 +0000 (02:16 +0200)

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

Thu, 29 Nov 2012 00:16:58 +0000 (02:16 +0200)
author Ezio Melotti <ezio.melotti@gmail.com>
Thu, 29 Nov 2012 00:16:58 +0000 (02:16 +0200)
committer Ezio Melotti <ezio.melotti@gmail.com>
Thu, 29 Nov 2012 00:16:58 +0000 (02:16 +0200)
diff --cc Misc/ACKS

index ced316890b1667fd0fccd86fdb4ce2025a821a4d,640287dc5340a235f55f1cb6655085195dcb8b3f..996989d5c152561e2ab354b111a6982bc21e210f
--- 1/Misc/ACKS
--- 2/Misc/ACKS
+++ b/Misc/ACKS
@@@ -888,7 -807,7 +888,8 @@@ Alexandre Parentea
   Dan Parisien
   William Park
   Harri Pasanen
+ +Gaël Pasgrimaud
+ Berker Peksag
   Bo Peng
   Joe Peterson
   Randy Pausch
diff --cc Misc/NEWS
Simple merge
author	Ezio Melotti <ezio.melotti@gmail.com>
	Thu, 29 Nov 2012 00:16:58 +0000 (02:16 +0200)
committer	Ezio Melotti <ezio.melotti@gmail.com>
	Thu, 29 Nov 2012 00:16:58 +0000 (02:16 +0200)
		1	2
Misc/ACKS	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history