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

[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  b36befa821736129ca12dd502c9287b0ae0f4b55 (commit)
       via  836e0d2c03c74daed967f191bdb1ccde75376ad8 (commit)
       via  05dd542cebf0e33b4dd1ee30d5b4190a6f18e277 (commit)
       via  e6ebf10bba5d9ebec0f8d9995df16d2eb384f44f (commit)
      from  bb032138e72a6428e404d9f3593430b7fd989f45 (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 b36befa821736129ca12dd502c9287b0ae0f4b55
Merge: 836e0d2c03c74daed967f191bdb1ccde75376ad8 05dd542cebf0e33b4dd1ee30d5b4190a6f18e277
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Fri Dec 3 12:55:25 2010 +1300

    Merge remote branch 'kc/new/enh/bug_4983' into kcmaster

commit 836e0d2c03c74daed967f191bdb1ccde75376ad8
Merge: bb032138e72a6428e404d9f3593430b7fd989f45 e6ebf10bba5d9ebec0f8d9995df16d2eb384f44f
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Fri Dec 3 12:55:20 2010 +1300

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

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

Summary of changes:
 .../intranet-tmpl/prog/en/css/staff-global.css     |    5 ++-
 .../prog/en/modules/catalogue/results.tmpl         |   18 ++++++++++-----
 .../prog/en/modules/tools/batchMod-del.tmpl        |   22 ++++++++++++-------
 tools/batchMod.pl                                  |    3 ++
 4 files changed, 32 insertions(+), 16 deletions(-)


hooks/post-receive
-- 
main Koha release repository