[Python-checkins] cpython (merge 3.1 -> 3.2): merge 3.1 (with 3.1.5rc1 release tag)

[benjamin.peterson]

http://hg.python.org/cpython/rev/2fe39437e243
changeset:   75197:2fe39437e243
branch:      3.2
parent:      75178:eb46c8f44aae
parent:      75196:a71de4f4412d
user:        Benjamin Peterson <benjamin at python.org>
date:        Thu Feb 23 10:48:03 2012 -0500
summary:
  merge 3.1 (with 3.1.5rc1 release tag)

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


diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -77,6 +77,7 @@
 a4f75773c0060cee38b0bb651a7aba6f56b0e996 v3.1.3
 32fcb9e94985cb19ce37ba9543f091c0dbe9d7dd v3.1.4rc1
 c918ec9f3a76d6afedfbb5d455004de880443a3d v3.1.4
+ee26aca3219cf4bb0b93352e83edcc9cb28c7802 v3.1.5rc1
 b37b7834757492d009b99cf0ca4d42d2153d7fac v3.2a1
 56d4373cecb73c8b45126ba7b045b3c7b3f94b0b v3.2a2
 da012d9a2c23d144e399d2e01a55b8a83ad94573 v3.2a3

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