]> git.koha-community.org Git - koha.git/commit
Merge remote-tracking branch 'origin/new/bug_6328'
authorPaul Poulain <paul.poulain@biblibre.com>
Fri, 6 Jan 2012 09:52:47 +0000 (10:52 +0100)
committerPaul Poulain <paul.poulain@biblibre.com>
Fri, 6 Jan 2012 09:52:47 +0000 (10:52 +0100)
commit236747534115e35975de8d51554e6e87f4248462
treedce174a47a7cfddb668b96b69a357a5a42fe7798
parent1730e180cdbe11a7878ddfab54cec7291d12f430
parente0095c55852a9c4614ea37df67c4882f9fc3128f
Merge remote-tracking branch 'origin/new/bug_6328'

Conflicts:
kohaversion.pl
installer/data/mysql/updatedatabase.pl