# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1350628490 18000
# Node ID d118a4f4fd16d9b558ec3f3e87bfee772861d2b7
# Parent  605fe310691fbe1579ca8458f9f640d921ce3f1e# Parent  d51364b318eab1871af13f30be099799c04a43d1
merge default into stable for 2.4 code freeze