Merge 3.2 into 3.3.

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

diff --cc .hgtags
index 1bcb10ec1fa436e0e0c6bd4ab54eece5ff2b26b0,83c67ec624ee41405c61b44954eb03c0f4352600..1f39d6eaa5528d445913e32afd89bbd63e5df2f1
--- 1/.hgtags
--- 2/.hgtags
+++ b/.hgtags
@@@ -101,16 -101,4 +101,17 @@@ c860feaa348d663e598986894ee4680480577e1
  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
 +7c51388a3aa7ce76a8541bbbdfc05d2d259a162c v3.3.0a4
 +e15c554cd43eb23bc0a528a4e8741da9bbec9607 v3.3.0b1
 +4972a8f1b2aa3d7cdd64dc96aa7fa112fe1ea343 v3.3.0b2
 +8bb5c7bc46ba43804480f3e328e1fa956672c885 v3.3.0rc1
 +88a0792e8ba3e4916b24c7e7a522c277d326d66e v3.3.0rc2
 +c191d21cefafb3832c45570e84854e309aa62eaa v3.3.0rc3
 +bd8afb90ebf28ba4edc901d4a235f75e7bbc79fd v3.3.0
 +92c2cfb924055ce68c4f78f836dcfe688437ceb8 v3.3.1rc1
 +d9893d13c6289aa03d33559ec67f97dcbf5c9e3c v3.3.1
 +d047928ae3f6314a13b6137051315453d0ae89b6 v3.3.2