# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1389972741 0
# Node ID 95880c8fedb61f3a0a5c1a289aeb685e61583361
# Parent  48123437bbc562151d6971732419687ba1420c51# Parent  79f68c0ed71ec29b83204fbc2fa3b691f28b9f8c
Merge with stable