# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1399016346 -7200
# Node ID 7e193663b0d6b466f205a48e275fc803d348f5b3
# Parent  3b0bcc658eefe5a37bc22c3ba21629f421ec3a9d# Parent  8d921a12dd31552d4d8b2fe3038b82400dfde79d
Merge with stable