From: Dirk Koopman <djk@tobit.co.uk>
Date: Wed, 15 Feb 2012 15:47:15 +0000 (+0000)
Subject: Merge branch 'master' into anyevent
X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=ec1b2a19fcc6539f071a766671b5fa5be8694362;p=spider.git

Merge branch 'master' into anyevent

Conflicts:
	data/cty.dat
	data/prefix_data.pl
	perl/Version.pm
---

ec1b2a19fcc6539f071a766671b5fa5be8694362
diff --cc perl/Version.pm
index ca438058,aa4f82fc..1c31c216
--- a/perl/Version.pm
+++ b/perl/Version.pm
@@@ -9,9 -9,9 +9,9 @@@ package main
  
  use vars qw($version $subversion $build $gitversion);
  
 -$version = '1.55';
 +$version = '1.56';
  $subversion = '0';
- $build = '19';
- $gitversion = '6d73d85';
 -$build = '104';
 -$gitversion = '4cb816f';
++$build = '20';
++$gitversion = '85eea0e';
  
  1;