From: Dirk Koopman <djk@tobit.co.uk>
Date: Mon, 12 Mar 2012 23:44:36 +0000 (+0000)
Subject: Merge branch 'master' into anyevent
X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=0e896695f3297c3989a5159af0a36f28d8164c15;p=spider.git

Merge branch 'master' into anyevent

Conflicts:
	perl/DXUser.pm
	perl/Version.pm

Add database handling changes from master
---

0e896695f3297c3989a5159af0a36f28d8164c15
diff --cc perl/Version.pm
index 8942c46c,2e78796b..527a4f05
--- 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 = '30';
- $gitversion = '899ab26';
 -$build = '110';
 -$gitversion = '61885d0';
++$build = '31';
++$gitversion = '4e42369';
  
  1;