Merge remote branch 'kc/master' into new/enh/bug_5917
authorChris Cormack <chrisc@catalyst.net.nz>
Tue, 29 Mar 2011 19:39:10 +0000 (08:39 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Tue, 29 Mar 2011 19:39:10 +0000 (08:39 +1300)
commit76184e1db031014cee432ec6d9a78fe87768983c
tree92472fd9189640a8c4dc27e0a87f90a5f714514f
parentbbf72a85311f85b5d86ce0b77cdd2fb056da3eec
parent412966eff0016c69e5763197f1542e88c74580a1
Merge remote branch 'kc/master' into new/enh/bug_5917

Conflicts:
installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql
C4/Auth.pm
C4/Output.pm
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