From: Mark Dickinson <mdickinson@enthought.com>
Date: Sun, 27 Mar 2011 15:30:07 +0000 (+0100)
Subject: Merge #9696
X-Git-Tag: v3.2.1b1~195
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=79a9036d0988749c22294c33894342044878542e;p=python

Merge #9696
---

79a9036d0988749c22294c33894342044878542e
diff --cc Misc/ACKS
index 9747ae7ef5,7a0982b78b..c05da80645
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@@ -329,8 -302,8 +329,9 @@@ Hans de Graaf
  Eddy De Greef
  Duncan Grisby
  Fabian Groffen
 +Eric Groo
  Dag Gruneau
+ Filip Gruszczyński
  Michael Guravage
  Lars Gustäbel
  Thomas Güttler