# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1389714675 0
# Node ID 48123437bbc562151d6971732419687ba1420c51
# Parent  c44d24e2fc66ab201a4349121ad6c14430239136# Parent  2a1cad657b6d59e2f1d274461f0fbd208c9e06d7
Merge with stable