diff hgeditor @ 15566:7786b7dfbc46

merge with stable
author Matt Mackall <mpm@selenic.com>
date Wed, 23 Nov 2011 16:35:17 -0600
parents 2b440bb8a66b
children 1aee2ab0f902
line wrap: on
line diff