# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1509580031 -3600
# Node ID ade7a21ab324312d8af9684abc2074bba313bb7a
# Parent  90515d0bfb08eef1db5d7c10749b92e1c8717c6a# Parent  6ca44f334d47beb93587d47e0d90ae64335d19bf
branching: merge back stable back into default