# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1395277324 0
# Node ID e7fa36b2bd235acfca188ce53ab100ed3649c25e
# Parent  d9c3f8002e7c0d774ed1643222b2d1bad8e091da# Parent  e23422941bae4d5322870cb333697d4c3df6bf80
Merge with stable