# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1383326089 0
# Node ID f103c0693fbb677543cca9195233988498cbeaf7
# Parent  ce8024f2783737529f88dd7c31f5658861c3776b# Parent  761641fc16a63cdc1aa633f91147a939b912a135
Merge with stable