diff hgeditor @ 20095:1c46b18b0e1c

merge with stable
author Matt Mackall <mpm@selenic.com>
date Fri, 22 Nov 2013 17:26:58 -0600
parents 2b440bb8a66b
children 1aee2ab0f902
line wrap: on
line diff