Chris Cormack 4669a10776 Merge remote branch 'kc/new/enh/bug_1962' into kcmaster ... Conflicts: circ/returns.pl installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql installer/data/mysql/it-IT/necessari/sysprefs.sql installer/data/mysql/pl-PL/mandatory/sysprefs.sql installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql installer/data/mysql/uk-UA/mandatory/system_preferences_full_optimal_for_install_only.sql installer/data/mysql/updatedatabase.pl kohaversion.pl		2011-03-27 21:12:40 +13:00
..
authorised_values	Fix file permissions: if it is not a script, it should not be executable.	2010-04-16 00:40:34 -04:00
mandatory	Merge remote branch 'kc/new/enh/bug_1962' into kcmaster	2011-03-27 21:12:40 +13:00
marcflavour/unimarc	Fix file permissions: if it is not a script, it should not be executable.	2010-04-16 00:40:34 -04:00
optional	Bug 5646: Translated sql files break messaging	2011-03-18 09:18:57 +13:00