merge with stable
authorMatt Mackall <mpm@selenic.com>
Mon, 15 Nov 2010 10:57:49 -0600
changeset 12991 23de1a7f8e82
parent 12990 5f58e60f5777 (current diff)
parent 12989 827aa0992cea (diff)
child 12992 2b73a3279a9f
merge with stable
--- a/.hgsigs	Mon Nov 15 10:57:40 2010 -0600
+++ b/.hgsigs	Mon Nov 15 10:57:49 2010 -0600
@@ -29,3 +29,4 @@
 ff5cec76b1c5b6be9c3bb923aae8c3c6d079d6b9 0 iD8DBQBMdo+qywK+sNU5EO8RAqQpAJ975BL2CCAiWMz9SXthNQ9xG181IwCgp4O+KViHPkufZVFn2aTKMNvcr1A=
 93d8bff78c96fe7e33237b257558ee97290048a4 0 iD8DBQBMpfvdywK+sNU5EO8RAsxVAJ0UaL1XB51C76JUBhafc9GBefuMxwCdEWkTOzwvE0SarJBe9i008jhbqW4=
 333421b9e0f96c7bc788e5667c146a58a9440a55 0 iD8DBQBMz0HOywK+sNU5EO8RAlsEAJ0USh6yOG7OrWkADGunVt9QimBQnwCbBqeMnKgSbwEw8jZwE3Iz1mdrYlo=
+4438875ec01bd0fc32be92b0872eb6daeed4d44f 0 iD8DBQBM4WYUywK+sNU5EO8RAhCVAJ0dJswachwFAHALmk1x0RJehxzqPQCbBNskP9n/X689jB+btNTZTyKU/fw=
--- a/.hgtags	Mon Nov 15 10:57:40 2010 -0600
+++ b/.hgtags	Mon Nov 15 10:57:49 2010 -0600
@@ -41,3 +41,4 @@
 ff5cec76b1c5b6be9c3bb923aae8c3c6d079d6b9 1.6.3
 93d8bff78c96fe7e33237b257558ee97290048a4 1.6.4
 333421b9e0f96c7bc788e5667c146a58a9440a55 1.7
+4438875ec01bd0fc32be92b0872eb6daeed4d44f 1.7.1