commit b38b5c43c710da8fd6034d1dab631c5b020652bf
author Georg Brandl <georg@python.org> Mon Feb 10 22:11:21 2014 +0100
committer Georg Brandl <georg@python.org> Mon Feb 10 22:11:21 2014 +0100
tree 567e29cd2f5fe5bfb48bce00109321cd29ae1bff
parent 6093a125ee900738a1840afb6980ec426cacad68

merge with 3.3

.hgtags

diff --git a/.hgtags b/.hgtags
index 979e8ad..2d5c42b 100644
--- a/.hgtags
+++ b/.hgtags
@@ -118,6 +118,8 @@
 fd53c500f8b80f54f3ecedec9da2e8c7e52a6888 v3.3.3rc1
 d32442c0e60dfbd71234e807d3d1dedd227495a9 v3.3.3rc2
 c3896275c0f61b2510a6c7e6c458a750359a91b8 v3.3.3
+fa92f5f940c6c0d839d7f0611e4b717606504a3c v3.3.4rc1
+7ff62415e4263c432c8acf6e424224209211eadb v3.3.4
 46535f65e7f3bcdcf176f36d34bc1fed719ffd2b v3.4.0a1
 9265a2168e2cb2a84785d8717792acc661e6b692 v3.4.0a2
 dd9cdf90a5073510877e9dd5112f8e6cf20d5e89 v3.4.0a3