# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1454372947 21600
# Node ID 8e79ad2da8a69735488402fd018dd82bc1eb9309
# Parent  d73a5ab18015f61ac61e6e77256512fd82b03818# Parent  f5d06d31b7937249ed8e02fa3ea5af867130eb2d
merge with stable