# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1393768387 0
# Node ID 42b428c5fcd895bb72ff67b4e861896afd70938b
# Parent  ea8abd9436eea2e3fc043e327408c2d2a24f6cbc# Parent  2cb27f4b641c5dbc050dad0c3551d97cc0a8fa0d
Merge with stable