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

[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  2cf3e24797d80e266bd2f4bb0a0f5a9ba400b236 (commit)
       via  8464104fb299d1b1d707c0a083a04dce7c108953 (commit)
      from  8307a1f79d8143e05c734cc750bb420c1ff41e1c (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 2cf3e24797d80e266bd2f4bb0a0f5a9ba400b236
Merge: 8307a1f79d8143e05c734cc750bb420c1ff41e1c 8464104fb299d1b1d707c0a083a04dce7c108953
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Sat Apr 9 10:22:46 2011 +1200

    Merge remote branch 'kc/new/bug_5234' into kcmaster

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

Summary of changes:
 .../intranet-tmpl/prog/en/css/intranet-print.css   |  235 -------
 koha-tmpl/intranet-tmpl/prog/en/css/intranet.css   |  491 ---------------
 koha-tmpl/intranet-tmpl/prog/en/css/intranet2.css  |  665 --------------------
 .../intranet-tmpl/prog/en/css/intranet2popup.css   |  551 ----------------
 .../intranet-tmpl/prog/en/css/pages/addbiblio.css  |   75 ---
 .../intranet-tmpl/prog/en/css/staff-global2.css    |  575 -----------------
 6 files changed, 0 insertions(+), 2592 deletions(-)
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/css/intranet-print.css
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/css/intranet.css
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/css/intranet2.css
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/css/intranet2popup.css
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/css/pages/addbiblio.css
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/css/staff-global2.css


hooks/post-receive
-- 
main Koha release repository