# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1508533391 -7200
# Node ID c80ba40d4c87a3ede2604ec15369735c48e11b14
# Parent  504f914efd2934e662ef702e1ab8e651c7aab47e# Parent  663dbef40f97e269f4202e362e60098ca5a55d61
branching: merge stable back into default