Merge branch '3.2'

author Petri Lehtinen <petri@digip.org>

Sun, 12 Feb 2012 19:06:57 +0000 (21:06 +0200)

committer Petri Lehtinen <petri@digip.org>

Sun, 12 Feb 2012 19:06:57 +0000 (21:06 +0200)
author Petri Lehtinen <petri@digip.org>
Sun, 12 Feb 2012 19:06:57 +0000 (21:06 +0200)
committer Petri Lehtinen <petri@digip.org>
Sun, 12 Feb 2012 19:06:57 +0000 (21:06 +0200)
diff --cc Misc/ACKS

index b38673b98697b3930ac8c4cb26f82c1d2bf0095b,f79ecedd08d799d63abc41478db34c202840eb3a..a0f6f255451af309954c8b275141157f58dcb5e8
--- 1/Misc/ACKS
--- 2/Misc/ACKS
+++ b/Misc/ACKS
@@@ -543,9 -503,7 +543,10 @@@ Lenny Knele
   Pat Knight
   Greg Kochanski
   Damon Kohler
+ Marko Kohtala
+ +Jacek Konieczny
+ +Марк Коренберг
+ +Arkady Koplyarov
   Vlad Korolev
   Joseph Koshy
   Maksim Kozyarchuk
diff --cc Misc/NEWS
Simple merge
author	Petri Lehtinen <petri@digip.org>
	Sun, 12 Feb 2012 19:06:57 +0000 (21:06 +0200)
committer	Petri Lehtinen <petri@digip.org>
	Sun, 12 Feb 2012 19:06:57 +0000 (21:06 +0200)
		1	2
Misc/ACKS	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history