diff hgeditor @ 15027:1e45b92f4fb2

merge with stable
author Matt Mackall <mpm@selenic.com>
date Fri, 05 Aug 2011 16:07:51 -0500
parents 2b440bb8a66b
children 1aee2ab0f902
line wrap: on
line diff