# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1340118031 -3600
# Node ID 9459951761fbe2c7c1e618d1595a206be09babc5
# Parent  7f458d071b494ff09769f2456522c4b49399a588# Parent  51afb47e239970ae869d639b0983c1c93e111ec7
Merge with stable