# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1393953884 0
# Node ID 9dcd045229b427da50a71d3dd7b2ee5b0c1ff3a4
# Parent  42b428c5fcd895bb72ff67b4e861896afd70938b# Parent  49bef9bfeb50826ac631db1912d1a092150bb802
Merge with stable