# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1374190646 -3600
# Node ID 2e9c41125820bce7bd755374271096c6060e076f
# Parent  3fbd928acf60d92e90ec8fda106ed48e8210ea46# Parent  4b788bb2993d629584675ede5b842f4ac15a2ad0
Merge with stable