diff mercurial/encoding.py @ 13728:15d1db2abfcb

merge with stable
author Matt Mackall <mpm@selenic.com>
date Wed, 23 Mar 2011 09:20:40 -0500
parents 120eccaaa522
children b7b26e54e37a
line wrap: on
line diff