diff hgeditor @ 15534:80ec63090a7a

merge with stable
author Matt Mackall <mpm@selenic.com>
date Sun, 20 Nov 2011 16:06:18 -0600
parents 2b440bb8a66b
children 1aee2ab0f902
line wrap: on
line diff