changeset 12054:5d22e631c365

merge with stable
author Matt Mackall <mpm@selenic.com>
date Thu, 26 Aug 2010 11:03:12 -0500
parents dee1901a0ed8 (current diff) b10b07a821c3 (diff)
children 798ef5b19cb1 844880ec2bab
files mercurial/url.py mercurial/util.py
diffstat 2 files changed, 2 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/.hgsigs	Thu Aug 26 17:55:07 2010 +0200
+++ b/.hgsigs	Thu Aug 26 11:03:12 2010 -0500
@@ -26,3 +26,4 @@
 f786fc4b8764cd2a5526d259cf2f94d8a66924d9 0 iEYEABECAAYFAkwsyxcACgkQywK+sNU5EO+crACfUpNAF57PmClkSri9nJcBjb2goN4AniPCNaKvnki7TnUsi1u2oxltpKKL
 bf1774d95bde614af3956d92b20e2a0c68c5fec7 0 iEYEABECAAYFAkxVwccACgkQywK+sNU5EO+oFQCeJzwZ+we1fIIyBGCddHceOUAN++cAnjvT6A8ZWW0zV21NXIFF1qQmjxJd
 c00f03a4982e467fb6b6bd45908767db6df4771d 0 iEYEABECAAYFAkxXDqsACgkQywK+sNU5EO/GJACfT9Rz4hZOxPQEs91JwtmfjevO84gAmwSmtfo5mmWSm8gtTUebCcdTv0Kf
+ff5cec76b1c5b6be9c3bb923aae8c3c6d079d6b9 0 iD8DBQBMdo+qywK+sNU5EO8RAqQpAJ975BL2CCAiWMz9SXthNQ9xG181IwCgp4O+KViHPkufZVFn2aTKMNvcr1A=
--- a/.hgtags	Thu Aug 26 17:55:07 2010 +0200
+++ b/.hgtags	Thu Aug 26 11:03:12 2010 -0500
@@ -38,3 +38,4 @@
 f786fc4b8764cd2a5526d259cf2f94d8a66924d9 1.6
 bf1774d95bde614af3956d92b20e2a0c68c5fec7 1.6.1
 c00f03a4982e467fb6b6bd45908767db6df4771d 1.6.2
+ff5cec76b1c5b6be9c3bb923aae8c3c6d079d6b9 1.6.3