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

[benjamin.peterson]

http://hg.python.org/cpython/rev/96471e9722c7
changeset:   70783:96471e9722c7
parent:      70775:e572a97a1bd1
parent:      70782:9be10dad0d51
user:        Benjamin Peterson <benjamin at python.org>
date:        Sat Jun 11 10:01:35 2011 -0500
summary:
  merge 3.2

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


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

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