Merge remote branch 'kc/master' into new/enh/bug_5917
authorChris Cormack <chrisc@catalyst.net.nz>
Mon, 21 Mar 2011 06:54:11 +0000 (19:54 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Mon, 21 Mar 2011 06:54:11 +0000 (19:54 +1300)
Conflicts:
installer/data/mysql/en/mandatory/sysprefs.sql

1  2 
C4/Auth.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
koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc

diff --cc C4/Auth.pm
Simple merge