# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1375705178 -3600
# Node ID 451cbdc0b353c0727ea83b459ac1a9951aafce98
# Parent  2e9c41125820bce7bd755374271096c6060e076f# Parent  d56f50372ba5e413d54e21b3d3d18fe1dd2a2c81
Merge with stable