Chris Cormack 4669a10776 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		2011-03-27 21:12:40 +13:00
..
intranet-tmpl/prog	Merge remote branch 'kc/new/enh/bug_1962' into kcmaster	2011-03-27 21:12:40 +13:00
opac-tmpl/prog	Bug 5954: 490$a not used to create search link in XSLT	2011-03-27 21:02:33 +13:00
favicon.ico
index.html
intranet.html
opac.html
templates.readme