# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1340283855 -3600
# Node ID df702ad9b3148ad2d370027035f632f07e9045e2
# Parent  9459951761fbe2c7c1e618d1595a206be09babc5# Parent  d5b3404b82cea4a6e7defebdee79abe7d654c8eb
Merge with stable