# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1339419362 -3600
# Node ID 7f458d071b494ff09769f2456522c4b49399a588
# Parent  25db33023e4ed05e15e0740cbe15cff3aa34c224# Parent  cbb200487fb623490cd787e95f41c1392aa8f8d8
Merge with stable