[koha-commits] main Koha release repository branch, new/enh/bug_5917, updated. v3.02.00-1065-gb9d296b

[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, new/enh/bug_5917 has been updated
       via  b9d296b198ee5c1ead2176ea2e09c4ae0461672b (commit)
       via  96f7cfabca95612517f4dcf2ebc79fcc002ba569 (commit)
       via  637cf2604510e4efa6e5341cb76f37e6ede904d9 (commit)
       via  d8e239c23e23eb34eb2552cc036b364c869ceec2 (commit)
      from  d3bb227afcb9782fe7bb2bedecc0a00f0453041b (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 b9d296b198ee5c1ead2176ea2e09c4ae0461672b
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Wed Mar 23 21:47:56 2011 +1300

    Bug 5917 template changes

commit 96f7cfabca95612517f4dcf2ebc79fcc002ba569
Merge: d3bb227afcb9782fe7bb2bedecc0a00f0453041b 637cf2604510e4efa6e5341cb76f37e6ede904d9
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Wed Mar 23 21:47:03 2011 +1300

    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

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

Summary of changes:
 C4/Auth.pm                                         |    3 +++
 cataloguing/additem.pl                             |    2 +-
 installer/data/mysql/de-DE/mandatory/sysprefs.sql  |    5 ++++-
 installer/data/mysql/en/mandatory/sysprefs.sql     |    2 ++
 .../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 |    2 ++
 ...m_preferences_full_optimal_for_install_only.sql |    4 +++-
 installer/data/mysql/updatedatabase.pl             |    7 +++++++
 .../prog/en/includes/doc-head-close-receipt.inc    |    2 +-
 .../prog/en/includes/doc-head-close.inc            |    2 +-
 .../intranet-tmpl/prog/en/includes/help-top.inc    |    2 +-
 .../prog/en/modules/admin/preferences/opac.pref    |    5 +++++
 .../en/modules/admin/preferences/staff_client.pref |    5 +++++
 .../prog/en/modules/basket/basket.tmpl             |    2 +-
 .../prog/en/modules/members/moremember-print.tmpl  |    2 +-
 .../en/modules/members/moremember-receipt.tmpl     |    2 +-
 .../prog/en/modules/members/printfeercpt.tmpl      |    4 ++--
 .../prog/en/modules/members/printinvoice.tmpl      |    2 +-
 .../opac-tmpl/prog/en/includes/doc-head-close.inc  |    2 +-
 .../prog/en/includes/doc-head-close-receipt.inc    |    2 +-
 .../prog/en/includes/doc-head-close.inc            |    2 +-
 .../intranet-tmpl/prog/en/includes/help-top.inc    |    2 +-
 .../intranet-tmpl/prog/en/modules/basket/basket.tt |    2 +-
 .../prog/en/modules/members/moremember-print.tt    |    2 +-
 .../prog/en/modules/members/moremember-receipt.tt  |    2 +-
 .../prog/en/modules/members/printfeercpt.tt        |    4 ++--
 .../prog/en/modules/members/printinvoice.tt        |    2 +-
 .../opac-tmpl/prog/en/includes/doc-head-close.inc  |    2 +-
 30 files changed, 59 insertions(+), 23 deletions(-)


hooks/post-receive
-- 
main Koha release repository