changeset 15763:d730f8608b3a

merge with stable
author Matt Mackall <mpm@selenic.com>
date Sun, 01 Jan 2012 14:06:24 -0600
parents 6568a8649ed9 (current diff) c8ea040bc1af (diff)
children 8e1854807dc2
files
diffstat 2 files changed, 2 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/.hgsigs	Sun Jan 01 14:05:03 2012 -0600
+++ b/.hgsigs	Sun Jan 01 14:06:24 2012 -0600
@@ -46,3 +46,4 @@
 384082750f2c51dc917d85a7145748330fa6ef4d 0 iD8DBQBOmd+OywK+sNU5EO8RAgDgAJ9V/X+G7VLwhTpHrZNiOHabzSyzYQCdE2kKfIevJUYB9QLAWCWP6DPwrwI=
 41453d55b481ddfcc1dacb445179649e24ca861d 0 iD8DBQBOsFhpywK+sNU5EO8RAqM6AKCyfxUae3/zLuiLdQz+JR78690eMACfQ6JTBQib4AbE+rUDdkeFYg9K/+4=
 195dbd1cef0c2f9f8bcf4ea303238105f716bda3 0 iD8DBQBO1/fWywK+sNU5EO8RAmoPAKCR5lpv1D6JLURHD8KVLSV4GRVEBgCgnd0Sy78ligNfqAMafmACRDvj7vo=
+6344043924497cd06d781d9014c66802285072e4 0 iD8DBQBPALgmywK+sNU5EO8RAlfhAJ9nYOdWnhfVDHYtDTJAyJtXBAQS9wCgnefoSQt7QABkbGxM+Q85UYEBuD0=
--- a/.hgtags	Sun Jan 01 14:05:03 2012 -0600
+++ b/.hgtags	Sun Jan 01 14:06:24 2012 -0600
@@ -58,3 +58,4 @@
 384082750f2c51dc917d85a7145748330fa6ef4d 2.0-rc
 41453d55b481ddfcc1dacb445179649e24ca861d 2.0
 195dbd1cef0c2f9f8bcf4ea303238105f716bda3 2.0.1
+6344043924497cd06d781d9014c66802285072e4 2.0.2