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

[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  5145eb59b786bd2010eb324197034dd210504543 (commit)
       via  8640007ca030dc3800401c84e9d973de01be4b2f (commit)
       via  92de0f7eaf841c7bc3928c7da449cb87e361cc8e (commit)
      from  ef087b000620b5c5d113a4cabe5b8c22c984b3f8 (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 5145eb59b786bd2010eb324197034dd210504543
Merge: ef087b000620b5c5d113a4cabe5b8c22c984b3f8 8640007ca030dc3800401c84e9d973de01be4b2f
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Wed Nov 3 14:58:40 2010 +1300

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

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

Summary of changes:
 .../prog/en/modules/help/cataloguing/merge.tmpl    |   23 ++++++++++++++++++++
 .../prog/en/modules/virtualshelves/shelves.tmpl    |    4 +-
 2 files changed, 25 insertions(+), 2 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/help/cataloguing/merge.tmpl


hooks/post-receive
-- 
main Koha release repository