From: Georg Brandl <georg@python.org>
Date: Sun, 18 Mar 2012 19:39:46 +0000 (+0100)
Subject: Dummy-merge (except .hgtags) 3.2.3rc2 changes.
X-Git-Tag: v3.3.0a2~113
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d87c29843db9e530b8647795659fe39e68337fd5;p=thirdparty%2FPython%2Fcpython.git

Dummy-merge (except .hgtags) 3.2.3rc2 changes.
---

d87c29843db9e530b8647795659fe39e68337fd5
diff --cc .hgtags
index 0414826e84f7,87582aa19b8d..16154565025a
--- a/.hgtags
+++ b/.hgtags
@@@ -95,4 -95,4 +95,5 @@@ ac1f7e5c05104d557d5acd922e95625ba5d1fe1
  c860feaa348d663e598986894ee4680480577e15 v3.2.2rc1
  137e45f15c0bd262c9ad4c032d97425bc0589456 v3.2.2
  7085403daf439adb3f9e70ef13f6bedb1c447376 v3.2.3rc1
+ 428f05cb7277e1d42bb9dd8d1af6b6270ebc6112 v3.2.3rc2
 +f1a9a6505731714f0e157453ff850e3b71615c45 v3.3.0a1