Merge remote branch 'kc/master' into new/enh/bug_5917
authorChris Cormack <chrisc@catalyst.net.nz>
Sun, 3 Apr 2011 10:35:24 +0000 (22:35 +1200)
committerChris Cormack <chrisc@catalyst.net.nz>
Sun, 3 Apr 2011 10:35:24 +0000 (22:35 +1200)
1  2 
C4/Auth.pm
catalogue/search.pl
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
Simple merge