# HG changeset patch
# User Damien Correia
# Date 1529490087 -7200
# Node ID f7da4f6817e28c7c8d4adaf76730fe4758d20d2e
# Parent  7fc18ab1b5b41c14693ed2460e00cf0506ef46d9# Parent  06915aa059c503d3ef55cf0a9bbd857bef40e559
merge default