# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1357601400 0
# Node ID 5ac75dd311d5e374a8e9afe19f4b97793ce75242
# Parent  07a7aabca5ce16dea34cd90829cbc01ddcc8765f# Parent  6f276a9239897787171cc86cb7fa7d169dffbf8f
Merge with stable