# HG changeset patch # User Pierre-Yves David # Date 1453096964 28800 # Node ID 91e67ad4cb6c783fa1a32e03359aa6d73c765129 # Parent 6cdc0dee9d58d7840b91b179398968bfe7bf3bd7# Parent 190e4e526c66e528d872d02c8ebe9797509b53a9 merge with stable