# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1364049810 0
# Node ID 757cf8d4724bdefb796fc6582267c43fc890812d
# Parent  09f857c44abeb8a194d226c66d8d1778919944ce# Parent  cefcbbc5502c4533e2d4efc23a92e6301db09617
Merge with stable