# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1341399846 -3600
# Node ID eef22f846b0ece944b8dde9a607ddc485748af48
# Parent  3007e5d9eb4e0e2aa2e25739175cfc81dfef17fc# Parent  22b300b7a7c149e0800cf102a927e056b0bdd0db
Merge with default