comparison hg @ 15847:c47d69ce5208

merge with stable
author Matt Mackall <mpm@selenic.com>
date Wed, 11 Jan 2012 09:27:53 -0600
parents 659f34b833b9
children 73e4a02e6d23
comparison
equal deleted inserted replaced
15846:e7dde08254b7 15847:c47d69ce5208