diff hgeditor @ 13954:1184bb274cb3

merge with stable
author Matt Mackall <mpm@selenic.com>
date Mon, 18 Apr 2011 20:52:08 -0500
parents 2b440bb8a66b
children 1aee2ab0f902
line wrap: on
line diff