# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1406935972 18000
# Node ID 3467cf39aae688e844d5c1c22b7daa85c590bef9
# Parent  7142e04b438eab39685e63085503b8af0e42b31e# Parent  8cab8a5006a5b17727538dd98be8a8704c5fd856
merge with stable