# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1370554578 -3600
# Node ID b42c9f1d461a4d5aebeb363c39815abaa25c1fb3
# Parent  f061386149340aa69e6dcebd55002506ad60357e# Parent  f31eefe0ab4cb42dff2ebf64cc5b9f6ed9061efb
Merge with stable