# HG changeset patch
# User telesto
# Date 1423075363 -3600
#      Wed Feb 04 19:42:43 2015 +0100
# Node ID ee63f8d65fc43654d297fecf2e73d814ff611cde
# Parent  cf4c6502d274507ca93724aec81386d7f261b6cb
# Parent  40c37a13ee788b57a2d85a0265a8ffa1c68001ca
merge