# HG changeset patch
# User ivo <ivo@UFO-Net.nl>
# Date 1276300803 -7200
# Node ID 21cba5fdad6911ace650732eb58c05c3d0f4b965
# Parent  78dce981c236dfb7e1d0b9b858b5e289adbd638f# Parent  0e67b9ea9a31a6209ca90586ce289e7c3ebeff64
Merge branch 'master' of git://git1.somerandomnick.ano