# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1392037722 -3600
# Node ID 89668f3ba3bc308526d4c50051e3c548629c7819
# Parent  0af7748569a8b43142ffd951d4291b42833eb439# Parent  8caca8a82e37be71ea4b715b07ee850220cf5059
Merge with stable