[koha-commits] main Koha release repository branch, master, updated. v3.02.00-75-gef087b0

[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  ef087b000620b5c5d113a4cabe5b8c22c984b3f8 (commit)
       via  ba35ce60e1cefbfa0cfbedaca218f46f2662310e (commit)
       via  1117f6920ceccecc8ba30987b3840748f067fc7c (commit)
      from  ae6ae0b39ddaff68d33a488a1ce2a3c5b2091efc (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 ef087b000620b5c5d113a4cabe5b8c22c984b3f8
Merge: ae6ae0b39ddaff68d33a488a1ce2a3c5b2091efc ba35ce60e1cefbfa0cfbedaca218f46f2662310e
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Wed Nov 3 14:48:37 2010 +1300

    Merge remote branch 'kc/new/bug_4991' into kcmaster
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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

Summary of changes:
 C4/Calendar.pm                                     |    2 +-
 .../intranet-tmpl/prog/en/css/staff-global.css     |    6 +-
 .../prog/en/modules/tools/holidays.tmpl            |  329 ++++++++++----------
 tools/holidays.pl                                  |   20 +-
 4 files changed, 173 insertions(+), 184 deletions(-)


hooks/post-receive
-- 
main Koha release repository