Merge with stable
authorMatt Mackall <mpm@selenic.com>
Fri, 01 Jan 2010 18:10:10 -0600
changeset 10195 1139fcfeaeda
parent 10192 8161127a638f (current diff)
parent 10194 a275c3997e03 (diff)
child 10196 20d849251fe6
Merge with stable
--- a/.hgsigs	Fri Jan 01 15:45:48 2010 -0600
+++ b/.hgsigs	Fri Jan 01 18:10:10 2010 -0600
@@ -16,3 +16,4 @@
 3ef6c14a1e8e83a31226f5881b7fe6095bbfa6f6 0 iEYEABECAAYFAkpopLIACgkQywK+sNU5EO8QSgCfZ0ztsd071rOa2lhmp9Fyue/WoI0AoLTei80/xrhRlB8L/rZEf2KBl8dA
 31ec469f9b556f11819937cf68ee53f2be927ebf 0 iEYEABECAAYFAksBuxAACgkQywK+sNU5EO+mBwCfagB+A0txzWZ6dRpug3LEoK7Z1QsAoKpbk8vsLjv6/oRDicSk/qBu33+m
 439d7ea6fe3aa4ab9ec274a68846779153789de9 0 iEYEABECAAYFAksVw0kACgkQywK+sNU5EO/oZwCfdfBEkgp38xq6wN2F4nj+SzofrJIAnjmxt04vaJSeOOeHylHvk6lzuQsw
+296a0b14a68621f6990c54fdba0083f6f20935bf 0 iEYEABECAAYFAks+jCoACgkQywK+sNU5EO9J8wCeMUGF9E/gS2UBsqIz56WS4HMPRPUAoI5J95mwEIK8Clrl7qFRidNI6APq
--- a/.hgtags	Fri Jan 01 15:45:48 2010 -0600
+++ b/.hgtags	Fri Jan 01 18:10:10 2010 -0600
@@ -28,3 +28,4 @@
 3ef6c14a1e8e83a31226f5881b7fe6095bbfa6f6 1.3.1
 31ec469f9b556f11819937cf68ee53f2be927ebf 1.4
 439d7ea6fe3aa4ab9ec274a68846779153789de9 1.4.1
+296a0b14a68621f6990c54fdba0083f6f20935bf 1.4.2