]> git.koha-community.org Git - koha.git/commit
Merge remote branch 'kc/new/signoffs' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Thu, 4 Nov 2010 07:14:28 +0000 (20:14 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Thu, 4 Nov 2010 07:14:28 +0000 (20:14 +1300)
commit414b2ace4fa5804d27e927b9b573dcb973761c87
tree7b3927ee65a2ebe88de7aff89cd50a6505752bbb
parentc836b63a7d5481f62b7c0044722b3c4bc37e0708
parentb96617dea8fcd35d4f4f2f19860a2b7f14489e97
Merge remote branch 'kc/new/signoffs' into kcmaster

Conflicts:
installer/data/mysql/updatedatabase.pl

Updated updatedatabase.pl to handle new version number
etc/zebradb/marc_defs/marc21/biblios/record.abs
installer/data/mysql/updatedatabase.pl
kohaversion.pl