[Python-checkins] cpython (merge 3.3 -> default): merge with 3.3

[georg.brandl]

http://hg.python.org/cpython/rev/d6ad412dee40
changeset:   87177:d6ad412dee40
parent:      87166:c2f1bb56760d
parent:      87176:895c80ce4e10
user:        Georg Brandl <georg at python.org>
date:        Sun Nov 17 09:19:11 2013 +0100
summary:
  merge with 3.3

files:
  .hgtags |  2 ++
  1 files changed, 2 insertions(+), 0 deletions(-)


diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -116,6 +116,8 @@
 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

-- 
Repository URL: http://hg.python.org/cpython