# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1370695565 -3600
# Node ID 181e420ff0ac7f23ae69677bbe07fa96a5ffc5f5
# Parent  b42c9f1d461a4d5aebeb363c39815abaa25c1fb3# Parent  79e0df6ffaad1128f54230f003063ef42095c035
Merge with stable