]> git.koha-community.org Git - koha.git/commit
Merge branch 'patroncards-wip' of git://git.foundations.edu/koha into community
authorHenri-Damien LAURENT <henridamien.laurent@biblibre.com>
Wed, 20 Jan 2010 22:16:34 +0000 (23:16 +0100)
committerHenri-Damien LAURENT <henridamien.laurent@biblibre.com>
Wed, 20 Jan 2010 22:16:34 +0000 (23:16 +0100)
commitd339abf0bfc334a819818bbb9b4c31f23326cbd1
treeff812e58c8b91e1b579a8775bef17dbffb7e0919
parentb97d97079107df1fb6294dc273e9d652662eea61
parentff13d25bb3874152737f61de04eeed3bb9b72341
Merge branch 'patroncards-wip' of git://git.foundations.edu/koha into community

Conflicts solved:
Makefile.PL
installer/data/mysql/en/mandatory/sysprefs.sql
installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql
installer/data/mysql/updatedatabase.pl
kohaversion.pl
C4/Acquisition.pm
C4/Search.pm
Makefile.PL
admin/systempreferences.pl
installer/data/mysql/en/mandatory/sysprefs.sql
installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql
installer/data/mysql/kohastructure.sql
installer/data/mysql/updatedatabase.pl
koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tmpl
kohaversion.pl