From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 11 Jun 2011 15:01:14 +0000 (-0500)
Subject: merge 3.1
X-Git-Tag: v3.3.0a1~2132^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=98661d13d74fcffa4d77f0709d2123703e2ae106;p=python

merge 3.1
---

98661d13d74fcffa4d77f0709d2123703e2ae106
diff --cc .hgtags
index 407bbcb350,8dd99752a5..c12bf2284f
--- a/.hgtags
+++ b/.hgtags
@@@ -76,15 -76,4 +76,16 @@@ a69a031ac1402dede8b1ef80096436bca6d371f
  d18e9d71f369d8211f6ac87252c6d3211f9bd09f v3.1.3rc1
  a4f75773c0060cee38b0bb651a7aba6f56b0e996 v3.1.3
  32fcb9e94985cb19ce37ba9543f091c0dbe9d7dd v3.1.4rc1
+ c918ec9f3a76d6afedfbb5d455004de880443a3d v3.1.4
 +b37b7834757492d009b99cf0ca4d42d2153d7fac v3.2a1
 +56d4373cecb73c8b45126ba7b045b3c7b3f94b0b v3.2a2
 +da012d9a2c23d144e399d2e01a55b8a83ad94573 v3.2a3
 +d92a5b850f5e56808bedc01723906ed64c5e6e2e v3.2a4
 +b635cea94195780c8716e236479af319bcc26253 v3.2b1
 +e3af5f3a7904c0d5343ec9633ea66e7acfd23a66 v3.2b2
 +865d5b24bf28ca41b536befc326407c03e74a4d5 v3.2rc1
 +acf3e24dd0d0dfd1e20c907d696d3da965a8f56f v3.2rc2
 +18c1f52896501c7ee13b038454a39acb45a87979 v3.2rc3
 +a222a015e28d8ae9af3899258dc6c15c3d40add0 v3.2
 +8ffac2337a3323323d02153ac919fd1483176652 v3.2.1b1
 +cfa9364997c7f2e67b9cbb45c3a5fa3bba4e4999 v3.2.1rc1