diff hgeditor @ 16256:c655e4acaa82

merge with stable
author Matt Mackall <mpm@selenic.com>
date Tue, 13 Mar 2012 16:29:13 -0500
parents 2b440bb8a66b
children 1aee2ab0f902
line wrap: on
line diff