# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1357929195 0
# Node ID ce275f3522b2a339039e27329f435daf4e47abfb
# Parent  ecb744c2a1995913900755cf7e4c4508eb628b54# Parent  5eb5ba3b9e99170ae48feb06f6a5681c4bd79e3f
Merge with default