Chris Cormack 8e00f55216 Merge remote branch 'kc/master' into new/enh/bug_5917 ... Conflicts: installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql		2011-03-30 20:53:45 +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/master' into new/enh/bug_5917	2011-03-30 20:53:45 +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