Merge 3.2 into 3.3.

The only file change is adding the v3.2.5 tag to 3.3's .hgtags file.

Merge 3.2 into 3.3.
The only file change is adding the v3.2.5 tag to 3.3's .hgtags file.
0b169125 · Tim Peters · 1e440cf5 · 86d53cad · 0b169125
Commit 0b169125 authored Aug 21, 2013 by Tim Peters
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

.hgtags .hgtags +1 -0

No files found.
--- a/.hgtags
+++ b/.hgtags
@@ -101,6 +101,7 @@ c860feaa348d663e598986894ee4680480577e15 v3.2.2rc1
 3d0686d90f55a78f96d9403da2c52dc2411419d0 v3.2.3
 b2cb7bc1edb8493c0a78f9331eae3e8fba6a881d v3.2.4rc1
 1e10bdeabe3de02f038a63c001911561ac1d13a7 v3.2.4
+cef745775b6583446572cffad704100983db2bea v3.2.5
 f1a9a6505731714f0e157453ff850e3b71615c45 v3.3.0a1
 2f69db52d6de306cdaef0a0cc00cc823fb350b01 v3.3.0a2
 0b53b70a40a00013505eb35e3660057b62be77be v3.3.0a3