summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2011-07-09 09:00:36 (GMT)
committerGeorg Brandl <georg@python.org>2011-07-09 09:00:36 (GMT)
commitf514e61f5be3807b96665a92922df6d3abe95e44 (patch)
tree34b758badc0ec7316450b378621fbea4b0a9cea5
parent13d7db19f6cc84208e5084384aba7462cff88e9e (diff)
parent00ebeb540f48cf22878f82f274a82df36b01fda8 (diff)
downloadcpython-f514e61f5be3807b96665a92922df6d3abe95e44.zip
cpython-f514e61f5be3807b96665a92922df6d3abe95e44.tar.gz
cpython-f514e61f5be3807b96665a92922df6d3abe95e44.tar.bz2
Dummy-merge 3.2.1 release changes into default.
-rw-r--r--.hgtags1
1 files changed, 1 insertions, 0 deletions
diff --git a/.hgtags b/.hgtags
index 299db0b..97740e6 100644
--- a/.hgtags
+++ b/.hgtags
@@ -90,3 +90,4 @@ a222a015e28d8ae9af3899258dc6c15c3d40add0 v3.2
8ffac2337a3323323d02153ac919fd1483176652 v3.2.1b1
cfa9364997c7f2e67b9cbb45c3a5fa3bba4e4999 v3.2.1rc1
5df549718fb4841ff521fe051f6b54f290fad5d8 v3.2.1rc2
+ac1f7e5c05104d557d5acd922e95625ba5d1fe10 v3.2.1