# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1422903048 21600
# Node ID a8dc5a3f4f4c2d7195a1ccf1712ef70e2080dc0e
# Parent  3cbb5bf4035de5a22bc736f34e4bd6167c1c8c14# Parent  3667bc21b8773715d9472a3b4e034b77e62c6451
merge with stable