# HG changeset patch # User Pierre-Yves David # Date 1549980194 -3600 # Node ID 9a6cebfb596b8f5db1f01d5692e28709e072368d # Parent 3722557b008cc153e095afeaf3f48256e1d5f300# Parent 5bca2c579b05e674775b736e1b3872b5e0d61da0 branching: merge with stable