diff hgeditor @ 16881:2255950e1f76

merge with stable
author Matt Mackall <mpm@selenic.com>
date Wed, 06 Jun 2012 21:17:33 -0500
parents 2b440bb8a66b
children 1aee2ab0f902
line wrap: on
line diff