Chris Cormack 03890c90ac Merge remote branch 'kc/master' into new/enh/bug_5917 ... Conflicts: installer/data/mysql/en/mandatory/sysprefs.sql		2011-03-21 19:54:11 +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-21 19:54:11 +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