# HG changeset patch
# User Ivo Smits <Ivo@UCIS.nl>
# Date 1287171006 -7200
# Node ID c8c571b979da8f23093ba14b77dab40d0599ca32
# Parent  d31c5102047fdc00a145e15b84546165923d9a8a# Parent  45425cd06ee917ddd2ad20f9e448ec30ba5af4ab
Merge branch 'master' of git://git1.somerandomnick.ano

diff -r d31c5102047f -r c8c571b979da db/usr/astrosmash/git
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/usr/astrosmash/git	Fri Oct 15 21:30:06 2010 +0200
@@ -0,0 +1,1 @@
+git://1.1.90.10/