Merge commit 'kc/master'
authorChris Cormack <chrisc@catalyst.net.nz>
Thu, 24 Jun 2010 22:43:18 +0000 (10:43 +1200)
committerChris Cormack <chrisc@catalyst.net.nz>
Thu, 24 Jun 2010 22:43:18 +0000 (10:43 +1200)
commitf245998ac964881e9cc2b36434860c55698e8701
tree3b55baa38bb68852f9aa4450ed1e51feedc669f4
parentcca42b1e41a40fd66d0c946aae7b02455e9fa595
parentf0233c4f336ee96bba03f43d520a0326bb608504
Merge commit 'kc/master'

Conflicts:
docs/history.txt
C4/Auth.pm
installer/data/mysql/en/mandatory/sysprefs.sql
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