# HG changeset patch # User Pierre-Yves David # Date 1401830964 25200 # Node ID 35492ab5b33b81177511e9621e56f25ec9c9b0c1 # Parent 2b2a4ab0eb68cb6bc01a445d4ec474e3676dfc1d# Parent cd24a87e3042564abdf2c89568d2891eeafb6163 merge back into stable The 2,7 is meant to be a subset of stable.