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
..
mandatory	Merge remote branch 'kc/master' into new/enh/bug_5917	2011-03-30 08:39:10 +13:00
marcflavour	Bug 5619: Subfield 9 missing from most authorised heading fields	2011-01-25 19:25:11 +13:00
optional	Bug 5370: Fix references to koha.org and other old websites	2010-11-07 19:50:52 +13:00