[koha-commits] main Koha release repository branch master updated. v3.08.00-1320-gbfb6711

[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  bfb67119ce4fdf09a83bc865f68dededa7bdb7cd (commit)
       via  e7954504f3d8e138cf385604617bd88711717df6 (commit)
       via  7d1d4b85db3362234dae99ff0880649a7bf3b1ee (commit)
       via  17ee9d3afb929886416c26e463b5059d8ad542d7 (commit)
      from  6081b94e3c3af21e90f14b73611216d1c4cbd31d (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 bfb67119ce4fdf09a83bc865f68dededa7bdb7cd
Merge: 17ee9d3 e795450
Author: Jared Camins-Esakov <jcamins at cpbibliography.com>
Date:   Wed Nov 28 08:31:25 2012 -0500

    Merge branch 'bug_6680' into 3.12-master

commit e7954504f3d8e138cf385604617bd88711717df6
Author: Nicole C. Engard <nengard at bywatersolutions.com>
Date:   Wed Sep 7 11:48:01 2011 -0400

    Follow up to Bug 6680: tiny up download lists formats
    
    Explains what uses RIS, and replaces iso2709 with 'MARC'.
    
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Simply change, all tests pass.
    Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>

commit 7d1d4b85db3362234dae99ff0880649a7bf3b1ee
Author: Robin Sheat <robin at catalyst.net.nz>
Date:   Wed Sep 7 18:54:42 2011 +1200

    Bug 6680 - simple tidy-up of cart download format descriptions
    
    Explains what uses RIS, and replaces iso2709 with 'MARC'.
    
    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Simple change, all tests pass.
    Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>

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

Summary of changes:
 .../opac-tmpl/prog/en/modules/opac-downloadcart.tt |    6 +-
 .../prog/en/modules/opac-downloadshelf.tt          |    6 +-
 opac/opac-user.pl                                  |  114 ++++++++++----------
 3 files changed, 63 insertions(+), 63 deletions(-)


hooks/post-receive
-- 
main Koha release repository