[Python-checkins] cpython (merge 3.2 -> default): Merge tags from 3.2.

[georg.brandl]

http://hg.python.org/cpython/rev/5738c611ff2a
changeset:   68262:5738c611ff2a
parent:      68259:1a9595f1b1d4
parent:      68261:a0752d92d207
user:        Georg Brandl <georg at python.org>
date:        Sat Mar 05 20:31:42 2011 +0100
summary:
  Merge tags from 3.2.

files:
  .hgtags

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -69,6 +69,12 @@
 4353fd0843cb31b356adc50f93d220e2e7255ef2 v3.1rc1
 0b87e438e1b53e3f812cad963a7fdb65d198ba2f v3.1rc2
 a69a031ac1402dede8b1ef80096436bca6d371f3 v3.1
+35efb1054ec6ceca72017a587263cb6a9257340b v3.1.1rc1
+8b9c0f573ab29c41c6c5fdcca82a1fe0ff5355af v3.1.1
+149b8b87514d10416b598884db5f74651f625b38 v3.1.2rc1
+960efa327c5d9c18df995437b0ac550cb89c9f85 v3.1.2
+d18e9d71f369d8211f6ac87252c6d3211f9bd09f v3.1.3rc1
+a4f75773c0060cee38b0bb651a7aba6f56b0e996 v3.1.3
 b37b7834757492d009b99cf0ca4d42d2153d7fac v3.2a1
 56d4373cecb73c8b45126ba7b045b3c7b3f94b0b v3.2a2
 da012d9a2c23d144e399d2e01a55b8a83ad94573 v3.2a3
@@ -78,3 +84,4 @@
 865d5b24bf28ca41b536befc326407c03e74a4d5 v3.2rc1
 acf3e24dd0d0dfd1e20c907d696d3da965a8f56f v3.2rc2
 18c1f52896501c7ee13b038454a39acb45a87979 v3.2rc3
+a222a015e28d8ae9af3899258dc6c15c3d40add0 v3.2

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