# HG changeset patch # User Pierre-Yves David # Date 1455151196 0 # Node ID bd59cc2ee2039c370a0343f683488cde2a106565 # Parent 5eedfe43e762ad15f9435a49e50ff1284701e81b# Parent dcf145d0ce21beda34ccd57ef8aed7bcb7f1bc44 merge with strange other head on stable