[koha-commits] main Koha release repository branch master updated. v3.22.00-488-g5ef5fb5

[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  5ef5fb5617d627da46a4ea475a3d9afc8da6e007 (commit)
      from  6d24219976c332c8fb7da69ceab6374627aeb95c (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 5ef5fb5617d627da46a4ea475a3d9afc8da6e007
Author: Julian Maurice <julian.maurice at biblibre.com>
Date:   Wed Jan 6 19:11:27 2016 +0100

    Bug 15358: Fix authorities merge
    
    Bug 8064 (Merge several biblio records) change some code used in both
    biblios and authorities merge tool without updating the authorities
    merge tool.
    This patch fixes that.
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com

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

Summary of changes:
 C4/AuthoritiesMarc.pm                              |    6 ++++--
 authorities/merge.pl                               |   22 ++++++++++++++------
 cataloguing/merge.pl                               |    2 +-
 .../prog/en/includes/merge-record.inc              |   20 +++++++++---------
 .../prog/en/modules/authorities/merge.tt           |    8 +++----
 5 files changed, 35 insertions(+), 23 deletions(-)


hooks/post-receive
-- 
main Koha release repository