# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1370249972 -3600
# Node ID f061386149340aa69e6dcebd55002506ad60357e
# Parent  19fe7b202b389bc021223f8145045966d265a41e# Parent  13890d7a70b19f5330ce12690f7725c5ff74afcf
Merge with stable