# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1358980258 0
# Node ID c762ba67e444a342ebc732f4f7ce0635ff22f40c
# Parent  531804688bf5b421391e2d9c3605405d0d333a1b# Parent  9fb4b2c19bd8de35e6a1f895604b1fd60e6c9e44
Merge with stable