Chris Cormack 76184e1db0 Merge remote branch 'kc/master' into new/enh/bug_5917 ... Conflicts: installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql		2011-03-30 08:39:10 +13:00
..
mysql	Merge remote branch 'kc/master' into new/enh/bug_5917	2011-03-30 08:39:10 +13:00
Pg	Bug 3464: Added altcontactcountry and B_address2 to borrowers and deletedborrowers	2009-09-06 10:01:51 -04:00