Merge tags from 2.5.

.hgtags

@@ -35,6 +35,8 @@ f08c7a2a56f80741f5f192fd0ebe0b0967a203cf v1.5.2b1
 55bba197d4870cdae62aeca00e20240a756b84f8 v2.0b2
 e276329cce036a5f9e9d3451256dca5984e543dc v2.0c1
 2fa4e35083e02342ca014bf5bfba46aecb816c31 v2.0
+83459cc191c1c9c8cc6b08ada99c02f0af6ad54f v2.0.1c1
+73de94a722d206a45c0b49d3011c629ead4d62b1 v2.0.1
 b60831eeab5a06dd3c5e8297a99e39297aa8794b v2.1a1
 b382f1f07ec6b2c95551658b30c6139eeb32077a v2.1a2
 d0c830db5e68edd4aaa3401216e610c9ff145826 v2.1b1
@@ -42,9 +44,35 @@ b59a536ae1ef3774fd85c17f623e8926b7b6c095 v2.1b2
 d611276e9ad53b5d32d1e8065e1d811c32f7d96f v2.1c1
 ff065e674af6c9ab895bd9eff7d9e9039a376c7d v2.1c2
 020e95d8180d7943fe54701e1db0a7d7d87e2b1e v2.1
+22bed2dd1b286564dea4d9a67d4ed80dc3225193 v2.1.1c1
+572533a3038d1832c8a200fb8718112dd83758e9 v2.1.1
+f76a425b14e4ee8ade5e9239598538534b3a90a4 v2.1.2c1
+cf31b10e45b48615094cae90e3c5bd072587d8e6 v2.1.2
+7d1504c80fa072b4ba86edda13a13b0a05ae8eab v2.1.3
 08796a137f1ada2462f7a3177306df5f67a767e1 v2.2a3
+765434e7aa019c1bb82f9813b8025830867cbdc0 v2.2.1c1
+11c952c7d4be6638040764910be80bd9c3c17de6 v2.2.1c2
+4045e6e92fafabad42f6c9989b67076fbad452ca v2.2
+394790316aa380d22e4d670bc69a639e725f0300 v2.2.1
+0128313c2855d71753f00fccc60bb39ed92a0c54 v2.2.2b1
+61d531533a86224a1c26917c18013d91f592fbfb v2.2.2
+ac77b91342534d09b1e432e1dc3b70dbbec3a919 v2.2.3c1
+f4f134ad46abd0bc973d3f6094ea56e62ac5c492 v2.2.3
 d054c29647f90bccb8345bd779bca1eecf2dd7f2 v2.3c1
 fce5c9e9abc722394cb2e909b7e2a39080d4448e v2.3c2
+fa65f6527fe134aa97e03e1b2af365d443b67dc7 v2.3.1
+7d7362a71253bff4fc1b0c825c14569778db8c36 v2.3.2c1
+be2533fb10a587c8da89b18c5f381f478d720593 v2.3.2
+d21d4ba2f973467d30794a3d2ac493658180e503 v2.3.3c1
+a8f1286f217129cdb53e320ee125d2c2c80e1377 v2.3.3
+3639861d02646af1da3123c25560c4db3d7edbce v2.3.4c1
+a74f9081c6970878cabe151f969617587915400c v2.3.4
+2639b10daa985b20b3cabec45169d523cac29d68 v2.3.5c1
+d228509424172f977edad4f7860a9c747cd655c8 v2.3.5
+b21427ff26475f9c7f4a701da324e951c2b162fe v2.3.6c1
+3b6fb5439c1061a941401245076c315beafcc787 v2.3.6
+893c7bd4a92bd889a85e691f49188c37b0a72357 v2.3.7c1
+2022943ad450c41d64708fb5caca2d2672b5b8f8 v2.3.7
 92ca658fd420095b6284c9ce6e9082a80285ec9c v2.4a1
 055fc6955f3c6522bfeb7ed4c671c97d5baaaac2 v2.4a2
 186b72550e53533ef6175f6411f932c1298193d7 v2.4a3
@@ -52,13 +80,38 @@ fce5c9e9abc722394cb2e909b7e2a39080d4448e v2.3c2
 7e387a9dcc79954a77695adef8b593da35be1214 v2.4b2
 ff80d8bbef6e13426c8a85d7f9d837b8f8f89834 v2.4c1
 f31e18d313c7a4fc66914b2d27e130a0f72c0b69 v2.4
-3dabd9bb496e9a68cd6cd94b7622973fc766405a v2.5a0
+1195f9ba3439097cc5b5a367e3ae1b43f157b264 v2.4.1c1
+333cf303543b680ec5e3fdf7e8c9661f9488a50e v2.4.1c2
+f9054d235870029afa33ef945bca7ece99616c10 v2.4.1
+d02d387554e200befceec999b788f4593b434b49 v2.4.2c1
+8d37276fdf077d6d23d963d3f7f95381d00f1926 v2.4.2
+7c5be7c0fdfdbbc0ac1d91c07038bc81412da412 v2.4.3c1
+8cca2492626ce408cd567110811c0692fd1d37dd v2.4.3
+baaeea722b1c97ca03179e5a02a4717e7017ba2a v2.4.4c1
+592ac93532efdfa9a40f47b96b1c1231d2eae0e5 v2.4.4
+1f7d628c70a9aefe762c2c32210876faf8d64c78 v2.4.5c1
+d8df4aa06261de5e4c0aa051e448697d4791e437 v2.4.5
+a6c3c715e2b70740c4b6b4f7dc6f47b16a7e5905 v2.4.6c1
+f3f1f1462c82536bb23796e70c85522144ee24db v2.4.6
 67192da3e69c985bb1272da932d7de6073033fad v2.5a0
 896f9fead17e720ec4a21de3ac214518da84845f v2.5a1
 26d0770f2b7ee289a39a3b55dcec1c1ee65849c5 v2.5a2
 d49b198f545cd82fbf735a22979c332b8a97eecb v2.5b1
 03b6fe57cd6df5bb34ca19f4b760b943186cc806 v2.5b2
 c0abb18299b442e1160d2f958bce18f66850caa9 v2.5b3
+2dc64d570e8d7a4498ab850108c85709c276df93 v2.5c1
+cc3cb3a8237ea545db917d84c49d8a0a5e175cc1 v2.5c2
+c10a71cf16e471425e6d7564e3f7a648f14b702e v2.5
+4777c4007b5b194423953d41b1e5e6adaaba6c5d v2.5.1c1
+490d8c09abcb814950be7bb7a25c3ff2047c7eb5 v2.5.1
+0a8aae575cdddbf3d133fcb4eed91080e3fe41f3 v2.5.2c1
+1d508bbbdb49a2b11629ee186a63928291b08694 v2.5.2
+9530d334d2624219e7ee1aecaf33532e910266bc v2.5.3c1
+3cc056d21c2f4435a534d23345bad9c0a9d9b3cb v2.5.3
+a0a6d9909312ad9c1d844af66e9c91931b93852a v2.5.4
+657f16582943739b906f66f7efad4014492c8b1c v2.5.5c1
+1dc91e9dd5c13a4bc2d3bb7d4b5896ab264f2325 v2.5.5c2
+7098a46f0b75e5aacfaf81d65d72e3613b023532 v2.5.5
 2d0bd095c420b0711000d9be66848f6cfd972b3b v2.6a1
 eec144917a189be11ed5efa35c6604d03bc62bcc v2.6a2
 48e9fb0a721799877f26edaef01ac6e6029b6812 v2.6a3