[koha-commits] main Koha release repository branch 3.8.x updated. v3.08.06-3-ge110a49

[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.8.x has been updated
       via  e110a49d1850d7bef9c7127dc1dbe2708f385565 (commit)
       via  239b7bd447b7a4ffa039959cc50b719f4c24878c (commit)
      from  e764f35dee8b1b3855c6e006b83df696c8dca702 (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 e110a49d1850d7bef9c7127dc1dbe2708f385565
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>

commit 239b7bd447b7a4ffa039959cc50b719f4c24878c
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>

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

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