commit 5e7b54277451b1ffc31c7aafa7b01d72fad0e87c
author Georg Brandl <georg@python.org> Sun Oct 12 09:29:19 2014 +0200
committer Georg Brandl <georg@python.org> Sun Oct 12 09:29:19 2014 +0200
tree 12925ec1863140b4a045167ba9f414e02a67c4ef
parent 3f5ee28f75387adf14f2c7bfaf3ca68193831c7e
parent 6f1abda02b53b29f60338462fb770e73c565bc46

Merge 3.2 into 3.3.

.hgtags

diff --git a/.hgtags b/.hgtags
index a4fd4e0..4abbc71 100644
--- a/.hgtags
+++ b/.hgtags
@@ -102,6 +102,8 @@
 b2cb7bc1edb8493c0a78f9331eae3e8fba6a881d v3.2.4rc1
 1e10bdeabe3de02f038a63c001911561ac1d13a7 v3.2.4
 cef745775b6583446572cffad704100983db2bea v3.2.5
+51382a5598ec96119cb84594572901c9c964dc3c v3.2.6rc1
+0bd5f4f14de965ca8e44c6e3965fee106176cfc4 v3.2.6
 f1a9a6505731714f0e157453ff850e3b71615c45 v3.3.0a1
 2f69db52d6de306cdaef0a0cc00cc823fb350b01 v3.3.0a2
 0b53b70a40a00013505eb35e3660057b62be77be v3.3.0a3