# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1351805448 18000
# Node ID df84bec19dcef425bd4c17d242015fc6c7c40461
# Parent  917a37b76845811aaea1dc9b1ad0a8110e8b7439# Parent  fac6d36d04cb1838cd10bdcecd487567787fb853
merge with stable