# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1397478085 -3600
# Node ID 3b0bcc658eefe5a37bc22c3ba21629f421ec3a9d
# Parent  b3bee87276316a2e9a35feceb21a54ee3f9ab908# Parent  d6cab997a43e009effd051c8cbb386eb3ee702d7
Merge with stable