From: dirk <dirk@server.tobit.co.uk>
Date: Thu, 14 Jun 2007 22:03:30 +0000 (+0200)
Subject: Merge /scm/spider into SIMPLEROUTE
X-Git-Tag: 1.55~160^2~12^2~1
X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=commitdiff_plain;h=d7dbb7fe3680afb068ffc585b1f95690008a9a7d;hp=d7dbb7fe3680afb068ffc585b1f95690008a9a7d;p=spider.git

Merge /scm/spider into SIMPLEROUTE

Conflicts:

	.gitignore
	Changes
	cmd/Aliases
	data/.gitignore
	filter/.gitignore
	msg/.gitignore
	perl/DXChannel.pm
	perl/DXProt.pm
	perl/DXSql/SQLite.pm
	perl/DXSql/mysql.pm
	perl/DXXml.pm
	perl/DXXml/Cmd.pm
	perl/DXXml/IM.pm
	perl/DXXml/Text.pm
	perl/Msg.pm
	perl/Route/Node.pm
	perl/Version.pm

Fix merge into existing tree
---