# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1367713536 -3600
# Node ID 19fe7b202b389bc021223f8145045966d265a41e
# Parent  45a6eace22bf28d557731e2c4848fa837f3561ed# Parent  f3c19de4b29c4a214c773aa6c42eb387c23170df
Merge with stable