[koha-commits] main Koha release repository branch, 3.2.x, updated. v3.02.00-96-gb2af1f8

[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.2.x has been updated
       via  b2af1f850daa1dc041e109d8a51fedbf4b03c7bf (commit)
      from  740070ab789846e7e13cbc2d64e20d918cd00426 (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 b2af1f850daa1dc041e109d8a51fedbf4b03c7bf
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Thu Nov 11 11:33:10 2010 +1300

    Merge remote branch 'kc/master' into new/bug_5105
    
    Conflict fixed
    
    Conflicts:
    	opac/opac-detail.pl
    (cherry picked from commit dcb86689f73089ceaa789a92c34e78200d05af61)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

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

Summary of changes:
 C4/Reports/Guided.pm            |  111 ++++++++++++++++++---------------------
 basket/downloadcart.pl          |   21 ++++---
 opac/opac-detail.pl             |    1 -
 opac/opac-downloadcart.pl       |   29 ++++++-----
 opac/opac-downloadshelf.pl      |   25 +++++----
 tools/batchMod.pl               |   69 +++++++++++-------------
 virtualshelves/downloadshelf.pl |   25 +++++----
 7 files changed, 140 insertions(+), 141 deletions(-)


hooks/post-receive
-- 
main Koha release repository