Merge remote branch 'kc/master' into new/enh/bug_5917
authorChris Cormack <chrisc@catalyst.net.nz>
Wed, 30 Mar 2011 07:53:45 +0000 (20:53 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Wed, 30 Mar 2011 07:53:45 +0000 (20:53 +1300)
commit8e00f55216feb6b160d281b7020639cc27928dd2
treecf7e977c70481ed555d8ccc3ba8e4e5896d63725
parent86e2fbbe49cd0c7b0203b3f179cd9280b14ff404
parent223436970b44098b97679fc6e696b88eb74f2db3
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
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