# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1467040852 -7200
# Node ID 57632586ecc6da96f63c3b6bb2f86893b495308e
# Parent  481a88323f8dfdb97ef779f256d2d4f2f4f5f405# Parent  cb2b84c883d4e64b1bb61d1ee17f3cd0f454a500
integration dev->mainline