# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1392367933 -3600
# Node ID 90d2e5021063b448d2f77faf00a9baa885c0a920
# Parent  7fb45860e26779024c0679d9a09ce7cf332f85ff# Parent  e307d04d3c4df8a1cc8221c3ec7d9c2410bf5a94
Merge with stable