# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1393282579 0
# Node ID 4f72c00b7bcf03daa29e8fc766347ff6fddad11f
# Parent  64c56144ce887f50980434bd1fb8b022899d8c14# Parent  958582800276d9395d5bc6d7a9982d9cece7bfcc
Merge with stable