]> git.koha-community.org Git - koha.git/commit
Merge remote branch 'kc/new/enh/bug_1962' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Sun, 27 Mar 2011 08:12:40 +0000 (21:12 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Sun, 27 Mar 2011 08:12:40 +0000 (21:12 +1300)
commit4669a10776ff958a3b2d51963b7c4ec90ec02f09
tree8d95cf6ab681d4ccea7d2ae75abead20638a0787
parent6e59b9a295a640e24742325c660c165a4d962091
parentb3866aff5d21b4558e8d4580ba37873422054a3e
Merge remote branch 'kc/new/enh/bug_1962' into kcmaster

Conflicts:
circ/returns.pl
installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql
installer/data/mysql/it-IT/necessari/sysprefs.sql
installer/data/mysql/pl-PL/mandatory/sysprefs.sql
installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql
installer/data/mysql/uk-UA/mandatory/system_preferences_full_optimal_for_install_only.sql
installer/data/mysql/updatedatabase.pl
kohaversion.pl
circ/returns.pl
installer/data/mysql/de-DE/mandatory/sysprefs.sql
installer/data/mysql/en/mandatory/sysprefs.sql
installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql
installer/data/mysql/it-IT/necessari/sysprefs.sql
installer/data/mysql/pl-PL/mandatory/sysprefs.sql
installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql
installer/data/mysql/uk-UA/mandatory/system_preferences_full_optimal_for_install_only.sql
installer/data/mysql/updatedatabase.pl
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
kohaversion.pl