# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1385643545 0
# Node ID c44d24e2fc66ab201a4349121ad6c14430239136
# Parent  02972bce7d415d0d31426f2b13739a2b22d260a8# Parent  1fed120bfa042d412db9a0a0284144dbbec321f3
Merge with stable