summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2012-04-11 16:36:46 (GMT)
committerGeorg Brandl <georg@python.org>2012-04-11 16:36:46 (GMT)
commit2a4864bea6b711f44be2913bd60e1603a856c68f (patch)
tree3912c32d6ff3be60bce27d18191df7283ed4b413
parent08bd4aaaf982f833251ff5107252b1314cf0a415 (diff)
parenta51497ab86519bd66fc2758a16493752ba59dad8 (diff)
downloadcpython-2a4864bea6b711f44be2913bd60e1603a856c68f.zip
cpython-2a4864bea6b711f44be2913bd60e1603a856c68f.tar.gz
cpython-2a4864bea6b711f44be2913bd60e1603a856c68f.tar.bz2
Merge 3.2
-rw-r--r--.hgtags1
1 files changed, 1 insertions, 0 deletions
diff --git a/.hgtags b/.hgtags
index 8ab75a8..0ebed2d 100644
--- a/.hgtags
+++ b/.hgtags
@@ -98,5 +98,6 @@ c860feaa348d663e598986894ee4680480577e15 v3.2.2rc1
137e45f15c0bd262c9ad4c032d97425bc0589456 v3.2.2
7085403daf439adb3f9e70ef13f6bedb1c447376 v3.2.3rc1
428f05cb7277e1d42bb9dd8d1af6b6270ebc6112 v3.2.3rc2
+3d0686d90f55a78f96d9403da2c52dc2411419d0 v3.2.3
f1a9a6505731714f0e157453ff850e3b71615c45 v3.3.0a1
2f69db52d6de306cdaef0a0cc00cc823fb350b01 v3.3.0a2