Merge with 1.5.3
authorMatt Mackall <mpm@selenic.com>
Thu, 13 May 2010 11:33:11 -0500
changeset 11172 e9226eb3af2a
parent 11169 3d0a9c8d7184 (current diff)
parent 11171 3b3261f6d9ba (diff)
child 11173 5b48d819d5f9
Merge with 1.5.3
--- a/.hgsigs	Wed May 12 15:40:58 2010 -0500
+++ b/.hgsigs	Thu May 13 11:33:11 2010 -0500
@@ -21,3 +21,4 @@
 ff2704a8ded37fbebd8b6eb5ec733731d725da8a 0 iEYEABECAAYFAkuRoSQACgkQywK+sNU5EO//3QCeJDc5r2uFyFCtAlpSA27DEE5rrxAAn2FSwTy9fhrB3QAdDQlwkEZcQzDh
 2b01dab594167bc0dd33331dbaa6dca3dca1b3aa 0 iEYEABECAAYFAku1IwIACgkQywK+sNU5EO9MjgCdHLVwkTZlNHxhcznZKBL1rjN+J7cAoLLWi9LTL6f/TgBaPSKOy1ublbaW
 39f725929f0c48c5fb3b90c071fc3066012456ca 0 iEYEABECAAYFAkvclvsACgkQywK+sNU5EO9FSwCeL9i5x8ALW/LE5+lCX6MFEAe4MhwAn1ev5o6SX6GrNdDfKweiemfO2VBk
+fdcf80f26604f233dc4d8f0a5ef9d7470e317e8a 0 iEYEABECAAYFAkvsKTkACgkQywK+sNU5EO9qEACgiSiRGvTG2vXGJ65tUSOIYihTuFAAnRzRIqEVSw8M8/RGeUXRps0IzaCO
--- a/.hgtags	Wed May 12 15:40:58 2010 -0500
+++ b/.hgtags	Thu May 13 11:33:11 2010 -0500
@@ -33,3 +33,4 @@
 ff2704a8ded37fbebd8b6eb5ec733731d725da8a 1.5
 2b01dab594167bc0dd33331dbaa6dca3dca1b3aa 1.5.1
 39f725929f0c48c5fb3b90c071fc3066012456ca 1.5.2
+fdcf80f26604f233dc4d8f0a5ef9d7470e317e8a 1.5.3