Merge with stable
authorMatt Mackall <mpm@selenic.com>
Sun, 01 Aug 2010 13:52:42 -0500
changeset 11726 b6f72d8d77ae
parent 11723 870844a6daed (current diff)
parent 11725 56b41b2cc690 (diff)
child 11728 226a328a7ff3
Merge with stable
--- a/.hgsigs	Sun Aug 01 08:54:30 2010 -0500
+++ b/.hgsigs	Sun Aug 01 13:52:42 2010 -0500
@@ -24,3 +24,4 @@
 fdcf80f26604f233dc4d8f0a5ef9d7470e317e8a 0 iEYEABECAAYFAkvsKTkACgkQywK+sNU5EO9qEACgiSiRGvTG2vXGJ65tUSOIYihTuFAAnRzRIqEVSw8M8/RGeUXRps0IzaCO
 24fe2629c6fd0c74c90bd066e77387c2b02e8437 0 iEYEABECAAYFAkwFLRsACgkQywK+sNU5EO+pJACgp13tPI+pbwKZV+LeMjcQ4H6tCZYAoJebzhd6a8yYx6qiwpJxA9BXZNXy
 f786fc4b8764cd2a5526d259cf2f94d8a66924d9 0 iEYEABECAAYFAkwsyxcACgkQywK+sNU5EO+crACfUpNAF57PmClkSri9nJcBjb2goN4AniPCNaKvnki7TnUsi1u2oxltpKKL
+bf1774d95bde614af3956d92b20e2a0c68c5fec7 0 iEYEABECAAYFAkxVwccACgkQywK+sNU5EO+oFQCeJzwZ+we1fIIyBGCddHceOUAN++cAnjvT6A8ZWW0zV21NXIFF1qQmjxJd
--- a/.hgtags	Sun Aug 01 08:54:30 2010 -0500
+++ b/.hgtags	Sun Aug 01 13:52:42 2010 -0500
@@ -36,3 +36,4 @@
 fdcf80f26604f233dc4d8f0a5ef9d7470e317e8a 1.5.3
 24fe2629c6fd0c74c90bd066e77387c2b02e8437 1.5.4
 f786fc4b8764cd2a5526d259cf2f94d8a66924d9 1.6
+bf1774d95bde614af3956d92b20e2a0c68c5fec7 1.6.1