summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2011-05-13 05:01:42 (GMT)
committerGeorg Brandl <georg@python.org>2011-05-13 05:01:42 (GMT)
commit91ba8669174a06660c18973390dc4fe48219a878 (patch)
treec368041e920dd24eb361884e60555aeaa8ac9e1f
parentb89b31a1588b78f9c08ed8b4f5519571c2a44a42 (diff)
parentcc5ea6860f059049e5c7825d9c3c47600a5d9a42 (diff)
downloadcpython-91ba8669174a06660c18973390dc4fe48219a878.zip
cpython-91ba8669174a06660c18973390dc4fe48219a878.tar.gz
cpython-91ba8669174a06660c18973390dc4fe48219a878.tar.bz2
Merge 3.2.1 release changes into default branch (a null merge except for the new tag.)
-rw-r--r--.hgtags1
1 files changed, 1 insertions, 0 deletions
diff --git a/.hgtags b/.hgtags
index 6427e41..a50964d 100644
--- a/.hgtags
+++ b/.hgtags
@@ -85,3 +85,4 @@ e3af5f3a7904c0d5343ec9633ea66e7acfd23a66 v3.2b2
acf3e24dd0d0dfd1e20c907d696d3da965a8f56f v3.2rc2
18c1f52896501c7ee13b038454a39acb45a87979 v3.2rc3
a222a015e28d8ae9af3899258dc6c15c3d40add0 v3.2
+8ffac2337a3323323d02153ac919fd1483176652 v3.2.1b1