# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1385643432 0
# Node ID 21d35cf4933ea3b4a37a7704213c6aca8bc6e1b1
# Parent  164ed9bf157c5020c7b6ab47d05c3297d1806b29# Parent  02972bce7d415d0d31426f2b13739a2b22d260a8
Merge with default