diff mercurial/bookmarks.py @ 16347:21b31e9c20f3

merge with stable
author Matt Mackall <mpm@selenic.com>
date Mon, 02 Apr 2012 17:02:50 -0500
parents 6b16ded5c810
children 5983de86462c
line wrap: on
line diff