# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1360325511 0
# Node ID fa2a1c11ae4b33e3d9718ad3b7d2019a5a393f6a
# Parent  49ca5f6f1a9553503d0dece72edfac4f8b5a21be# Parent  02c4186c3aca9c3fbe4f629e51b0a093077545f4
Merge with stable