# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1372684744 -3600
# Node ID 3fbd928acf60d92e90ec8fda106ed48e8210ea46
# Parent  b4ecdf12956ff606f77c70ab4ed11c17a37195b3# Parent  509a9dd1553cdf3079874f4db3cd753386bb37e3
Merge with stable