# HG changeset patch
# User ivo <ivo@UFO-Net.nl>
# Date 1276302603 -7200
# Node ID 039303d2e28d04afdcd4001b0951045ab738a691
# Parent  21cba5fdad6911ace650732eb58c05c3d0f4b965# Parent  f2fb1d2dcf8c4a28464692c7554e28e889eae2f5
Merge branch 'master' of git://git1.somerandomnick.ano