# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1508767557 -7200
# Node ID 8a390749ff67af94e61eefb592bbe75f345c991a
# Parent  c80ba40d4c87a3ede2604ec15369735c48e11b14# Parent  c3953ae44b879687e1af24cc7aff3d8b80e3dc84
branching: merge with stable

Prepare the 7.0.0 line.