Merge remote branch 'kc/master' into new/enh/bug_5917
authorChris Cormack <chrisc@catalyst.net.nz>
Wed, 23 Mar 2011 08:47:03 +0000 (21:47 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Wed, 23 Mar 2011 08:47:03 +0000 (21:47 +1300)
commit96f7cfabca95612517f4dcf2ebc79fcc002ba569
treeb8e0331f6af65d66ef07d7a60334bc87a0d62cf5
parentd3bb227afcb9782fe7bb2bedecc0a00f0453041b
parent637cf2604510e4efa6e5341cb76f37e6ede904d9
Merge remote branch 'kc/master' into new/enh/bug_5917

Conflicts:
installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql
installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.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