#8913: merge with 3.3.

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

Thu, 4 Apr 2013 06:16:42 +0000 (09:16 +0300)

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

Thu, 4 Apr 2013 06:16:42 +0000 (09:16 +0300)
author Ezio Melotti <ezio.melotti@gmail.com>
Thu, 4 Apr 2013 06:16:42 +0000 (09:16 +0300)
committer Ezio Melotti <ezio.melotti@gmail.com>
Thu, 4 Apr 2013 06:16:42 +0000 (09:16 +0300)
diff --cc Misc/ACKS

index 9af88330d42fdb3c4fd0bde77b0114d8cafb363a,03310ed3bc781e8f3c7ae1d23eb4d2dd56d483b5..3686b6a573d4d16982000f51925345fb3176dfff
--- 1/Misc/ACKS
--- 2/Misc/ACKS
+++ b/Misc/ACKS
@@@ -922,9 -907,9 +922,10 @@@ Peter Parent
   Alexandre Parenteau
   Dan Parisien
   William Park
+ Heikki Partanen
   Harri Pasanen
   Gaël Pasgrimaud
+ +Ashish Nitin Patil
   Randy Pausch
   Samuele Pedroni
   Justin Peel
author	Ezio Melotti <ezio.melotti@gmail.com>
	Thu, 4 Apr 2013 06:16:42 +0000 (09:16 +0300)
committer	Ezio Melotti <ezio.melotti@gmail.com>
	Thu, 4 Apr 2013 06:16:42 +0000 (09:16 +0300)