]> git.koha-community.org Git - koha.git/commit
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)
commit7ea4760b06fa90314f0f7d8d165029100b804f02
tree0becb1dd940ec8690a75380bc887b80abfce1ac0
parent2202ee78c3abf41aa46d131036b1a4162c8faf35
parentf84c19fa70323b4fa89c0ff253e381619b7b14f0
Merge remote-tracking branch 'origin/new/bug_6880'

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