[koha-commits] main Koha release repository branch, master, updated. v3.02.00-974-g1c89ef1

[Git repo owner]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  1c89ef1af461091913c9f4bfd24afac456092c32 (commit)
       via  75aa5398c5582826161aa8b2096b6ffced1e35b6 (commit)
       via  f1663ada489cebc95344e165ce2d0f681acdeb5a (commit)
      from  937f27e6191f7080acc23c3122f1569e1ea2c024 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 1c89ef1af461091913c9f4bfd24afac456092c32
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Sat Apr 2 07:18:32 2011 +1300

    Updating version

commit 75aa5398c5582826161aa8b2096b6ffced1e35b6
Merge: 937f27e6191f7080acc23c3122f1569e1ea2c024 f1663ada489cebc95344e165ce2d0f681acdeb5a
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Sat Apr 2 07:15:47 2011 +1300

    Merge remote branch 'kc/new/enh/bug_4421' into kcmaster
    
    Conflicts:
    	C4/XSLT.pm
    	installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql
    	installer/data/mysql/it-IT/necessari/sysprefs.sql
    	installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql
    	installer/data/mysql/updatedatabase.pl

-----------------------------------------------------------------------

Summary of changes:
 C4/Search.pm                                       |   29 ++++++++++++++++++++
 C4/XSLT.pm                                         |    5 +++-
 catalogue/detail.pl                                |   27 ++++++++++++++++++
 installer/data/mysql/de-DE/mandatory/sysprefs.sql  |    3 ++
 installer/data/mysql/en/mandatory/sysprefs.sql     |    3 ++
 .../1-Obligatoire/unimarc_standard_systemprefs.sql |    2 +
 installer/data/mysql/it-IT/necessari/sysprefs.sql  |    2 +
 installer/data/mysql/pl-PL/mandatory/sysprefs.sql  |    3 ++
 ...m_preferences_full_optimal_for_install_only.sql |    3 +-
 ...m_preferences_full_optimal_for_install_only.sql |    2 +
 installer/data/mysql/updatedatabase.pl             |    7 +++++
 .../en/modules/admin/preferences/cataloguing.pref  |    6 ++++
 .../prog/en/modules/catalogue/detail.tmpl          |    8 +++++-
 .../prog/en/modules/catalogue/results.tmpl         |    9 ++++++
 .../opac-tmpl/prog/en/modules/opac-detail.tmpl     |    8 +++++-
 .../opac-tmpl/prog/en/modules/opac-results.tmpl    |    8 +++++-
 .../prog/en/xslt/MARC21slim2OPACResults.xsl        |   20 ++++++++++++-
 kohaversion.pl                                     |    2 +-
 opac/opac-detail.pl                                |   29 ++++++++++++++++++++
 19 files changed, 168 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
main Koha release repository