summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2013-11-17 08:19:11 (GMT)
committerGeorg Brandl <georg@python.org>2013-11-17 08:19:11 (GMT)
commitf41d0cc280caa5f74b1844d75ac806aeb620df23 (patch)
treeedcb80873cf6da571daa1c30f502133290c7a36d
parentc610aba1ed57a30104a254ccd1f9fe07d02b1334 (diff)
parent1d2436a5814fdbfe5a032934fe09489a33f0fb0a (diff)
downloadcpython-f41d0cc280caa5f74b1844d75ac806aeb620df23.zip
cpython-f41d0cc280caa5f74b1844d75ac806aeb620df23.tar.gz
cpython-f41d0cc280caa5f74b1844d75ac806aeb620df23.tar.bz2
merge with 3.3
-rw-r--r--.hgtags2
1 files changed, 2 insertions, 0 deletions
diff --git a/.hgtags b/.hgtags
index a02c774..2d7ca9b 100644
--- a/.hgtags
+++ b/.hgtags
@@ -116,6 +116,8 @@ bd8afb90ebf28ba4edc901d4a235f75e7bbc79fd v3.3.0
d9893d13c6289aa03d33559ec67f97dcbf5c9e3c v3.3.1
d047928ae3f6314a13b6137051315453d0ae89b6 v3.3.2
fd53c500f8b80f54f3ecedec9da2e8c7e52a6888 v3.3.3rc1
+d32442c0e60dfbd71234e807d3d1dedd227495a9 v3.3.3rc2
+c3896275c0f61b2510a6c7e6c458a750359a91b8 v3.3.3
46535f65e7f3bcdcf176f36d34bc1fed719ffd2b v3.4.0a1
9265a2168e2cb2a84785d8717792acc661e6b692 v3.4.0a2
dd9cdf90a5073510877e9dd5112f8e6cf20d5e89 v3.4.0a3