# HG changeset patch # User Ludovic Chabant # Date 1512970994 28800 # Node ID a7b50d960241ee8fe040c4eac48effebdf423d22 # Parent 4cbf9f8b4a3731b569b51753ab5ffcd80d98792b# Parent 89656bf503b269fbea9fdbe09c7fa7677c400733 Merge changes.