# HG changeset patch
# User Damien Correia
# Date 1523526244 -7200
# Node ID e8ebdd1417eaa3819d26ba6511bbc1e848b40a35
# Parent  2087ddaca9e2fb19688ce5565db19beaaea7ac9d# Parent  5dd1aa8bedd97f462faddfc0ab69040f3c7c6a88
merge default

diff -r 5dd1aa8bedd9 -r e8ebdd1417ea __init__.py