Merge remote branch 'kc/master' into new/enh/bug_5917
authorChris Cormack <chrisc@catalyst.net.nz>
Sun, 27 Mar 2011 20:16:50 +0000 (09:16 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Sun, 27 Mar 2011 20:16:50 +0000 (09:16 +1300)
commit71e1218fe1ad7bb2fc81e8d165306e958a67f325
tree296e29a14487abec42d11a3543dbfa10c8110839
parentb9d296b198ee5c1ead2176ea2e09c4ae0461672b
parenta4b2280b6be100727e5d6f85b9e6fe58392febf0
Merge remote branch 'kc/master' into new/enh/bug_5917
installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql
installer/data/mysql/pl-PL/mandatory/sysprefs.sql
installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql