[koha-commits] main Koha release repository branch 3.6.x updated. v3.06.10-2-g4ca53b9

[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, 3.6.x has been updated
       via  4ca53b9dd150445debf429aff2e57bee5f10bb72 (commit)
       via  6b927aeb46ae0743c6823c4f5c8bd1dabbad5469 (commit)
      from  4dda07d2523f0bd1a186a9eb409e9552fd737a94 (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 4ca53b9dd150445debf429aff2e57bee5f10bb72
Author: Paul Poulain <paul.poulain at biblibre.com>
Date:   Fri Oct 12 22:19:25 2012 +0200

    Bug 8862 follow-up s/\t/4spaces/g
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    Signed-off-by: Liz Rea - Catalyst <liz at catalyst.net.nz>

commit 6b927aeb46ae0743c6823c4f5c8bd1dabbad5469
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Tue Oct 2 08:58:40 2012 -0400

    Bug 8862 - merge.pl contains untranslatable strings
    
    Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
    
    It works: (1) merging's still effective, and (2) two new error messages appear
    in staff .po file after update it.
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    
    Conflicts:
    
    	koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    Signed-off-by: Liz Rea - Catalyst <liz at catalyst.net.nz>

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

Summary of changes:
 cataloguing/merge.pl                               |  129 ++++++++++----------
 .../prog/en/modules/cataloguing/merge.tt           |   34 ++++--
 2 files changed, 89 insertions(+), 74 deletions(-)


hooks/post-receive
-- 
main Koha release repository