# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1404143078 -7200
# Node ID 5983e59ac670e53d3eb0ecd655660134c732d5ae
# Parent  f1ff2a2f06cd558c94b3be454854e63aa48ef0bb# Parent  ef02bd1c2f0e9526ec31385361a9951eca8970da
merge