summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2012-03-18 19:39:46 (GMT)
committerGeorg Brandl <georg@python.org>2012-03-18 19:39:46 (GMT)
commitd87c29843db9e530b8647795659fe39e68337fd5 (patch)
tree200a7dd2ba7fa03867a1d71f774da606e53e431b
parent5802fdf31f80c5ba5f6eec149b418cf83e9c5f33 (diff)
parent3187749646340dd40779b4b0cd78db9a9edbe2fd (diff)
downloadcpython-d87c29843db9e530b8647795659fe39e68337fd5.zip
cpython-d87c29843db9e530b8647795659fe39e68337fd5.tar.gz
cpython-d87c29843db9e530b8647795659fe39e68337fd5.tar.bz2
Dummy-merge (except .hgtags) 3.2.3rc2 changes.
-rw-r--r--.hgtags1
1 files changed, 1 insertions, 0 deletions
diff --git a/.hgtags b/.hgtags
index 0414826..1615456 100644
--- a/.hgtags
+++ b/.hgtags
@@ -95,4 +95,5 @@ ac1f7e5c05104d557d5acd922e95625ba5d1fe10 v3.2.1
c860feaa348d663e598986894ee4680480577e15 v3.2.2rc1
137e45f15c0bd262c9ad4c032d97425bc0589456 v3.2.2
7085403daf439adb3f9e70ef13f6bedb1c447376 v3.2.3rc1
+428f05cb7277e1d42bb9dd8d1af6b6270ebc6112 v3.2.3rc2
f1a9a6505731714f0e157453ff850e3b71615c45 v3.3.0a1