# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1391469740 -3600
# Node ID 0af7748569a8b43142ffd951d4291b42833eb439
# Parent  95880c8fedb61f3a0a5c1a289aeb685e61583361# Parent  aeb658c7dbc70062f1110059edb8486f90d6c78b
Merge with stable