# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1341399994 -3600
# Node ID 9eb32646a6b8f1d90baa0b7b9112ccc90e37b6c1
# Parent  22b300b7a7c149e0800cf102a927e056b0bdd0db# Parent  8d5052f23e99b17b774bf05e274ef1d73b514b6b
Merge with stable