# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1379988779 -3600
# Node ID 5a04f94e1da9d94bb22bdb39f31337b46554b4df
# Parent  451cbdc0b353c0727ea83b459ac1a9951aafce98# Parent  6e9bfd51bc6feb310d79665e350e017366cac2f1
Merge with stable