diff hgeditor @ 16232:877aea86fb73

merge with stable
author Matt Mackall <mpm@selenic.com>
date Thu, 08 Mar 2012 15:59:33 -0600
parents 2b440bb8a66b
children 1aee2ab0f902
line wrap: on
line diff