]> git.koha-community.org Git - koha.git/commit
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)
commit03890c90ac41f66b2de04d0280e2e96a0d2e8be8
treeb841771ec156d90dcaca365cc4b8cebedab92765
parentbd151a4fd8685e60f9d325a5916e320dfb470122
parentc523ae2d646350996efa9cfc1e6149e1f1fac722
Merge remote branch 'kc/master' into new/enh/bug_5917

Conflicts:
installer/data/mysql/en/mandatory/sysprefs.sql
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