changeset 10312:131a012aa878

Merge with stable
author Matt Mackall <mpm@selenic.com>
date Mon, 01 Feb 2010 11:34:44 -0600
parents 0df9e63f0c07 (current diff) 7c5eb0988e7a (diff)
children d9aa5b368e36
files
diffstat 2 files changed, 2 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/.hgsigs	Mon Feb 01 09:18:58 2010 -0600
+++ b/.hgsigs	Mon Feb 01 11:34:44 2010 -0600
@@ -17,3 +17,4 @@
 31ec469f9b556f11819937cf68ee53f2be927ebf 0 iEYEABECAAYFAksBuxAACgkQywK+sNU5EO+mBwCfagB+A0txzWZ6dRpug3LEoK7Z1QsAoKpbk8vsLjv6/oRDicSk/qBu33+m
 439d7ea6fe3aa4ab9ec274a68846779153789de9 0 iEYEABECAAYFAksVw0kACgkQywK+sNU5EO/oZwCfdfBEkgp38xq6wN2F4nj+SzofrJIAnjmxt04vaJSeOOeHylHvk6lzuQsw
 296a0b14a68621f6990c54fdba0083f6f20935bf 0 iEYEABECAAYFAks+jCoACgkQywK+sNU5EO9J8wCeMUGF9E/gS2UBsqIz56WS4HMPRPUAoI5J95mwEIK8Clrl7qFRidNI6APq
+4aa619c4c2c09907034d9824ebb1dd0e878206eb 0 iEYEABECAAYFAktm9IsACgkQywK+sNU5EO9XGgCgk4HclRQhexEtooPE5GcUCdB6M8EAn2ptOhMVbIoO+JncA+tNACPFXh0O
--- a/.hgtags	Mon Feb 01 09:18:58 2010 -0600
+++ b/.hgtags	Mon Feb 01 11:34:44 2010 -0600
@@ -29,3 +29,4 @@
 31ec469f9b556f11819937cf68ee53f2be927ebf 1.4
 439d7ea6fe3aa4ab9ec274a68846779153789de9 1.4.1
 296a0b14a68621f6990c54fdba0083f6f20935bf 1.4.2
+4aa619c4c2c09907034d9824ebb1dd0e878206eb 1.4.3