# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1503524676 -7200
# Node ID cec3d2ea2eeb5a372aaaa2c47e86e2eec827d254
# Parent  a13acecbc8507b2ffb5b150871646b66f2c657c0# Parent  0d16c89aa18584443d08fd07c587d4cb14677c4a
merge with stable