# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1392155456 -3600
# Node ID 7fb45860e26779024c0679d9a09ce7cf332f85ff
# Parent  89668f3ba3bc308526d4c50051e3c548629c7819# Parent  953d562c3ebf93640f298fc4540568d7b0b785ad
Merge with stable