Merge remote-tracking branch 'origin/new/bug_6880'
authorPaul Poulain <paul.poulain@biblibre.com>
Fri, 6 Jan 2012 10:03:25 +0000 (11:03 +0100)
committerPaul Poulain <paul.poulain@biblibre.com>
Fri, 6 Jan 2012 10:03:25 +0000 (11:03 +0100)
Conflicts:
kohaversion.pl

1  2 
installer/data/mysql/updatedatabase.pl