# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1392654617 0
# Node ID 64c56144ce887f50980434bd1fb8b022899d8c14
# Parent  90d2e5021063b448d2f77faf00a9baa885c0a920# Parent  c559280de767e2b7ec2ec247c542b2741a4a6351
Merge with stable