# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1378241459 18000
# Node ID 4b83bcc1f96596d7a2a6c92e41072799339217ae
# Parent  5528c31c629cbf48c2b043b44c9db3534eba349b# Parent  bd5c1b49d106edc9975d29b5cf6d0960a4b33e27
merge with stable