Henri-Damien LAURENT d339abf0bf 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		2010-01-20 23:16:34 +01:00
..
Pg	Bug 3464: Added altcontactcountry and B_address2 to borrowers and deletedborrowers	2009-09-06 10:01:51 -04:00
mysql	Merge branch 'patroncards-wip' of git://git.foundations.edu/koha into community	2010-01-20 23:16:34 +01:00