# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1359497950 0
# Node ID 49ca5f6f1a9553503d0dece72edfac4f8b5a21be
# Parent  c762ba67e444a342ebc732f4f7ce0635ff22f40c# Parent  9bd54c35af97dddb1237d1886fb848e7943fc73c
Merge with stable