# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1398990243 18000
# Node ID b04a2f49cb553bc2cdc6ef20d2d9dc91c88f644b
# Parent  024f38f6d5f62b6e8de832e169d841eb04a1106f# Parent  cadad384c97c7956c98f3c9b92d8cc40fa16d93b
merge with stable