diff hgeditor @ 18535:7068089c95a2

merge with stable
author Matt Mackall <mpm@selenic.com>
date Fri, 01 Feb 2013 15:48:33 -0600
parents 2b440bb8a66b
children 1aee2ab0f902
line wrap: on
line diff