# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1394709572 0
# Node ID d9c3f8002e7c0d774ed1643222b2d1bad8e091da
# Parent  9dcd045229b427da50a71d3dd7b2ee5b0c1ff3a4# Parent  238b6ca6d2bb0c74a68dbe34ee4885942a41bad2
Merge with stable