Merge 3.2 into 3.3.

5e7b5427 · Georg Brandl · 3f5ee28f · 6f1abda0 · 5e7b5427
Commit 5e7b5427 authored Oct 12, 2014 by Georg Brandl
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

.hgtags .hgtags +2 -0

No files found.
--- a/.hgtags
+++ b/.hgtags
@@ -102,6 +102,8 @@ c860feaa348d663e598986894ee4680480577e15 v3.2.2rc1
 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