# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1333524707 -7200
# Node ID 3c257fefa53d4fb1e883a6fb1fff0f99b4203278
# Parent  2d2d93380694ccd98d4e1975769ce0387bb696cf# Parent  70b4494ccf1dc91c274d212f73d961a49351d3db
Merge with stable