[Python-checkins] cpython (merge 3.1 -> 3.2): merge 3.1

[benjamin.peterson]

http://hg.python.org/cpython/rev/85f4b38a61fa
changeset:   70506:85f4b38a61fa
branch:      3.2
parent:      70496:f290cba000ec
parent:      70505:35419f276c60
user:        Benjamin Peterson <benjamin at python.org>
date:        Sun May 29 16:43:52 2011 -0500
summary:
  merge 3.1

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


diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -75,6 +75,7 @@
 960efa327c5d9c18df995437b0ac550cb89c9f85 v3.1.2
 d18e9d71f369d8211f6ac87252c6d3211f9bd09f v3.1.3rc1
 a4f75773c0060cee38b0bb651a7aba6f56b0e996 v3.1.3
+32fcb9e94985cb19ce37ba9543f091c0dbe9d7dd v3.1.4rc1
 b37b7834757492d009b99cf0ca4d42d2153d7fac v3.2a1
 56d4373cecb73c8b45126ba7b045b3c7b3f94b0b v3.2a2
 da012d9a2c23d144e399d2e01a55b8a83ad94573 v3.2a3

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