[koha-commits] main Koha release repository branch master updated. v3.04.00-786-gc8df6bd

[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  c8df6bdcc9fe2523a77c839270b31304d8e13ee5 (commit)
       via  8d7608cd64a74d3513fb618d39a5a0f414fdf6a3 (commit)
      from  69333c9f79bf2cb8ac4e58f46da714dca962a8ee (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 c8df6bdcc9fe2523a77c839270b31304d8e13ee5
Merge: 69333c9 8d7608c
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Sat Oct 22 06:36:36 2011 +1300

    Merge remote-tracking branch 'kc/new/bug_5995' into kcmaster
    
    Conflicts:
    	opac/sco/sco-main.pl

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

Summary of changes:
 opac/sco/sco-main.pl |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
main Koha release repository