From: Dirk Koopman <djk@tobit.co.uk>
Date: Wed, 3 Mar 2010 14:47:15 +0000 (+0000)
Subject: Merge branch 'ip_address'
X-Git-Tag: 1.56~40
X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?p=spider.git;a=commitdiff_plain;h=ca46fb0822f3998466ffbe4c669271ee2af86859

Merge branch 'ip_address'

Add ip addresses to PC92 A records

Conflicts:

	perl/Version.pm
---

ca46fb0822f3998466ffbe4c669271ee2af86859
diff --cc perl/Version.pm
index 55e38233,605dca63..8b2a022e
--- a/perl/Version.pm
+++ b/perl/Version.pm
@@@ -9,8 -9,8 +9,8 @@@ package main
  
  use vars qw($version $subversion $build);
  
 -$version = '1.55';
 +$version = '';
  $subversion = '0';
- $build = '1';
+ $build = '57';
  
  1;