# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1347471883 -3600
# Node ID 193e68a0c8d267cdea2241232582253a83d826b4
# Parent  feb663195388a4e918f5073d4159705ea599e8f7# Parent  b90bb2b0826a3de8c1091da9d353648a79f1570b
Merge with stable