From: Georg Brandl <georg@python.org>
Date: Sun, 27 Oct 2013 08:54:53 +0000 (+0100)
Subject: merge with 3.3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=186729e81211ad04a2db523c3ac9e8e79aed3fd9;p=python

merge with 3.3
---

186729e81211ad04a2db523c3ac9e8e79aed3fd9
diff --cc .hgtags
index bed2c424a3,78b30dd17b..a02c774979
--- a/.hgtags
+++ b/.hgtags
@@@ -115,7 -115,4 +115,8 @@@ bd8afb90ebf28ba4edc901d4a235f75e7bbc79f
  92c2cfb924055ce68c4f78f836dcfe688437ceb8 v3.3.1rc1
  d9893d13c6289aa03d33559ec67f97dcbf5c9e3c v3.3.1
  d047928ae3f6314a13b6137051315453d0ae89b6 v3.3.2
+ fd53c500f8b80f54f3ecedec9da2e8c7e52a6888 v3.3.3rc1
 +46535f65e7f3bcdcf176f36d34bc1fed719ffd2b v3.4.0a1
 +9265a2168e2cb2a84785d8717792acc661e6b692 v3.4.0a2
 +dd9cdf90a5073510877e9dd5112f8e6cf20d5e89 v3.4.0a3
 +e245b0d7209bb6d0e19316e1e2af1aa9c2139104 v3.4.0a4