# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1460714436 -7200
# Node ID 698158e7b6915d70d9a8b26f0dd4dd6a4ac5a2d1
# Parent  ca2ee69520eb9d834ea6d65d3f2e39af971cf8b8# Parent  4c6bba5f44e778f26f9bd45d0c3ce0167e921280
merge