Merge remote branch 'kc/master'
authorChris Cormack <chrisc@catalyst.net.nz>
Sun, 31 Oct 2010 21:56:05 +0000 (10:56 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Sun, 31 Oct 2010 21:56:05 +0000 (10:56 +1300)
1  2 
C4/Auth.pm
installer/data/mysql/en/mandatory/sysprefs.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

diff --cc C4/Auth.pm
Simple merge