Merge with stable
authorMatt Mackall <mpm@selenic.com>
Sat, 01 May 2010 16:03:45 -0500
changeset 11083 4263d8998daa
parent 11080 23295cedf7f1 (current diff)
parent 11082 b8d0b4721aff (diff)
child 11084 4a8d4179362b
Merge with stable
--- a/.hgsigs	Sat May 01 17:56:54 2010 -0300
+++ b/.hgsigs	Sat May 01 16:03:45 2010 -0500
@@ -20,3 +20,4 @@
 4aa619c4c2c09907034d9824ebb1dd0e878206eb 0 iEYEABECAAYFAktm9IsACgkQywK+sNU5EO9XGgCgk4HclRQhexEtooPE5GcUCdB6M8EAn2ptOhMVbIoO+JncA+tNACPFXh0O
 ff2704a8ded37fbebd8b6eb5ec733731d725da8a 0 iEYEABECAAYFAkuRoSQACgkQywK+sNU5EO//3QCeJDc5r2uFyFCtAlpSA27DEE5rrxAAn2FSwTy9fhrB3QAdDQlwkEZcQzDh
 2b01dab594167bc0dd33331dbaa6dca3dca1b3aa 0 iEYEABECAAYFAku1IwIACgkQywK+sNU5EO9MjgCdHLVwkTZlNHxhcznZKBL1rjN+J7cAoLLWi9LTL6f/TgBaPSKOy1ublbaW
+39f725929f0c48c5fb3b90c071fc3066012456ca 0 iEYEABECAAYFAkvclvsACgkQywK+sNU5EO9FSwCeL9i5x8ALW/LE5+lCX6MFEAe4MhwAn1ev5o6SX6GrNdDfKweiemfO2VBk
--- a/.hgtags	Sat May 01 17:56:54 2010 -0300
+++ b/.hgtags	Sat May 01 16:03:45 2010 -0500
@@ -32,3 +32,4 @@
 4aa619c4c2c09907034d9824ebb1dd0e878206eb 1.4.3
 ff2704a8ded37fbebd8b6eb5ec733731d725da8a 1.5
 2b01dab594167bc0dd33331dbaa6dca3dca1b3aa 1.5.1
+39f725929f0c48c5fb3b90c071fc3066012456ca 1.5.2