# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1347573749 -3600
# Node ID 13a3f6161af826af1dba3f7cab296fdf01c62eb5
# Parent  193e68a0c8d267cdea2241232582253a83d826b4# Parent  1938c2ebf5173ccd65679057926a849c0e5a9474
Merge with stable