# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1411387024 -7200
# Node ID 6fa65ccf312d142171cca99aefc1e74a3be5f677
# Parent  c200a92734c95f111576438feb07fac178a243ad# Parent  3b372ab992ec36f8bb9d6ed363b4a389450076a6
merge