From: Dirk Koopman <djk@tobit.co.uk>
Date: Thu, 14 Jun 2007 22:10:51 +0000 (+0100)
Subject: Merge ssh://dirk@server/spider into SIMPLEROUTE
X-Git-Tag: 1.55~160^2~12
X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=8f5f9afaa7488fd046147e6b9136b0fc772a1463;p=spider.git

Merge ssh://dirk@server/spider into SIMPLEROUTE

Merge it all back again....

Conflicts:

	data/.gitignore
	perl/Version.pm
---

8f5f9afaa7488fd046147e6b9136b0fc772a1463