# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1371148679 -3600
# Node ID b4ecdf12956ff606f77c70ab4ed11c17a37195b3
# Parent  181e420ff0ac7f23ae69677bbe07fa96a5ffc5f5# Parent  f1a4e67c41fe84dd32b4673c97d35311e17eb0c7
Merge with stable