# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1380673331 -3600
# Node ID 115d2b6a8a9c62925751d8dca228b3c24eaef98e
# Parent  5a04f94e1da9d94bb22bdb39f31337b46554b4df# Parent  8e66ac9c0f0e8d72f633c862dba88dc547ac7e8e
Merge with stable