diff hgeditor @ 19306:59cdd3a7e281

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