Merge remote-tracking branch 'origin/new/bug_6328'

Conflicts:
	kohaversion.pl

diff --cc installer/data/mysql/updatedatabase.pl
index 67708fa,e901a58..3ff4ba3
--- 1/installer/data/mysql/updatedatabase.pl
--- 2/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@@ -4564,10 -4564,10 +4564,10 @@@ if ( C4::Context->preference("Version"
      SetVersion($DBversion);
  }
  
- $DBversion = "3.06.00.002";
+ $DBversion = "3.07.00.002";
  if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
      $dbh->do("UPDATE borrowers SET debarred=NULL WHERE debarred='0000-00-00';");
 -    print "Setting NULL to debarred where 0000-00-00 is stored (bug 7272)";
 +    print "Setting NULL to debarred where 0000-00-00 is stored (bug 7272)\n";
      SetVersion($DBversion);
  }