# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1397322837 -3600
# Node ID b3bee87276316a2e9a35feceb21a54ee3f9ab908
# Parent  a5dabff2e764df3af1d50c1feac5a4c350bd4bac# Parent  987a80dec7dbcccdc38813c1e4a4b7f1ac837025
Merge with stable