# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1357330351 0
# Node ID 07a7aabca5ce16dea34cd90829cbc01ddcc8765f
# Parent  e4157fb1161d6e9f5772dabbbcceab698f0ddcfe# Parent  68d1d29f6496c9af3f8b7bb5440ce116fceb93e6
Merge with stable