[koha-commits] main Koha release repository branch, master, updated. html_template_pro-376-gb4d6ad2

[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  b4d6ad26dc40b2f10c8cdd9d546f60cebfbd4b22 (commit)
       via  ce849240ad67131ead68f4339f49e861c6719882 (commit)
       via  0a27e64a5b1b3f1bd4248c3d63a56952fcd92788 (commit)
       via  7183f125839572350731f3adedef6af7f272e417 (commit)
       via  c2043933f7f9b30bf87a4c5656c50fd10584ef4f (commit)
       via  2650446d2681e92eea1f2e4369496298540fcc27 (commit)
       via  a3ff0bb5cb91761677f8b3ff08fa5f12378376af (commit)
       via  6e217d1d21ccff2a0179cd40c9a103f180bf53e3 (commit)
       via  faf7d17211bcacc436f6fe60fef015b558801196 (commit)
       via  80a21d2700b908461647092baa5550de954d896c (commit)
       via  d4ccd78335ef21a641eebe388576e417c7174957 (commit)
       via  e96315556b0043f4304b4cd8fb913d36f2ad4077 (commit)
       via  20c1ac5c8d75d3777bd145d99dda846b9602353a (commit)
       via  095f86ee6e443b6912c441a32457d0b379f1dbaf (commit)
       via  25c514c3e10113eaf7937be767f5b37389daefdf (commit)
       via  3584c4426bbe7687f4bbcf5fe9658a85e4021add (commit)
      from  c58c6c219c196f1a8b2f5d3bb85db6bd9ccb9500 (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 b4d6ad26dc40b2f10c8cdd9d546f60cebfbd4b22
Merge: c58c6c219c196f1a8b2f5d3bb85db6bd9ccb9500 ce849240ad67131ead68f4339f49e861c6719882
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Thu Apr 21 11:48:11 2011 +1200

    Merge branch 'new/enh/bug_5579' into kcmaster
    
    Conflicts:
    	C4/Biblio.pm

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

Summary of changes:
 C4/Biblio.pm                                      |   99 +++++++++-----
 C4/Charset.pm                                     |    8 +-
 C4/Items.pm                                       |  152 ++------------------
 C4/Record.pm                                      |    2 +-
 basket/downloadcart.pl                            |    2 +-
 catalogue/export.pl                               |   15 +--
 cataloguing/additem.pl                            |    3 +-
 misc/maintenance/remove_items_from_biblioitems.pl |   71 ++++++++++
 misc/maintenance/sync_items_in_marc_bib.pl        |  151 --------------------
 misc/migration_tools/bulkmarcimport.pl            |    3 +
 misc/migration_tools/rebuild_zebra.pl             |   29 ++++-
 opac/opac-downloadcart.pl                         |    2 +-
 opac/opac-downloadshelf.pl                        |    2 +-
 opac/opac-export.pl                               |   56 ++++----
 tools/export.pl                                   |    5 +-
 virtualshelves/downloadshelf.pl                   |    2 +-
 16 files changed, 226 insertions(+), 376 deletions(-)
 create mode 100755 misc/maintenance/remove_items_from_biblioitems.pl
 delete mode 100755 misc/maintenance/sync_items_in_marc_bib.pl


hooks/post-receive
-- 
main Koha release repository