# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1395477847 0
# Node ID a5dabff2e764df3af1d50c1feac5a4c350bd4bac
# Parent  e7fa36b2bd235acfca188ce53ab100ed3649c25e# Parent  1d3aa8779efb211ffaa9095349e242f1269878f9
Merge with stable