diff hgeditor @ 17683:6d7db5794e8c

merge with stable
author Matt Mackall <mpm@selenic.com>
date Sat, 29 Sep 2012 12:28:52 -0500
parents 2b440bb8a66b
children 1aee2ab0f902
line wrap: on
line diff