From: Georg Brandl <georg@python.org>
Date: Sat, 5 Mar 2011 19:41:44 +0000 (+0100)
Subject: Merge tags from 2.6.
X-Git-Tag: v2.7.2rc1~286
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c20dfe3c4617c71d6cc11dc45653ff2acd8cdab2;p=python

Merge tags from 2.6.
---

c20dfe3c4617c71d6cc11dc45653ff2acd8cdab2
diff --cc .hgtags
index 18d85d2edb,2fd5ff6353..f43df4bc4c
--- a/.hgtags
+++ b/.hgtags
@@@ -67,13 -121,17 +121,27 @@@ c62862d73f9ec64d655494cf1f61443446f2dea
  1ebb2a8cc06c94471d72b5476c2050c4d115a1aa v2.6rc1
  525792097c6308a78a76b7b5f56bbd8a24c26acf v2.6rc2
  95fff5a6a276520b2e7e0f75fe303f49376567a5 v2.6
+ cabf303e787aa5cd7209b40e3b2caba3ee75c5a5 v2.6.1
+ 01f1ae83631ae82bd8598a11c17e3f9b3f56c38a v2.6.2c1
+ 4feba09a826ba99e5b482707b3d9643eba34156f v2.6.2
+ 1873542c00000c4b7ce2c7992d1f2d87f866232a v2.6.3rc1
+ 00c3396d7a8c4ab4c2c841d61013a073ae921d0f v2.6.3
+ 25aa90a6865b63133962dd64626c53c7b6fd47d5 v2.6.4rc1
+ ea1fdafbe4fe2458ac17287e0d6c709ed00fce5c v2.6.4rc2
+ 8803c3d61da275c71cabe9e9d0274dac9902e2c0 v2.6.4
+ c9f68e42ab796a3bab4f8cf3cc69ce10503cb990 v2.6.5rc1
+ fa4630916699046357a5ac16884f3fc47bd0eaa6 v2.6.5rc2
+ 99af4b44e7e490390817a597a542546d749e698e v2.6.5
+ c1dc9e7986a2a8e1070ec7bee748520febef382e v2.6.6rc1
+ e189dc8fd66154ef46d9cd22584d56669b544ca3 v2.6.6rc2
+ 9f8771e0905277f8b3c2799113a062fda4164995 v2.6.6
 +b4107eb00b4271fb73a9e1b736d4f23460950778 v2.7a1
 +adc85ebc7271cc22e24e816782bb2b8d7fa3a6b3 v2.7a2
 +4180557b7a9bb9dd5341a18af199f843f199e46e v2.7a3
 +d2e1027edde84a02853fcf9790f311f10f46cf0a v2.7a4
 +61550a1302b07a731436a84b2d86eb2bab3b2fb0 v2.7b1
 +6bb9891d4275bd42a69b3d903d13b687543c915d v2.7b2
 +381c5eeb511038d091d8e0808c4b85087ed2f684 v2.7rc1
 +13e5b0b2071a2a42067fb03facc931409fa6ba50 v2.7rc2
 +63d9f00fea0730c1c437a50f64a42b7792bdcbfb v2.7rc1
 +5395f96588d4f0199d329cb79eb109648dc4ef5e v2.7.1