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

[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  2a3f7c141798121a75fc9ee670af0fdde431d9c2 (commit)
       via  f75f964ba40b7bdd1911842bc43b4df095aee583 (commit)
       via  bf1939798ffaa7a62b9866ba8b9d782cae963b90 (commit)
       via  fc1b7201c55d00d6c43a0ecc04bee09cd0e0bde7 (commit)
       via  febba50ba8e76e3e892946f819f1db14105aa807 (commit)
      from  a0367aa973ad61eda090d743cccd9cf387dfcc09 (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 2a3f7c141798121a75fc9ee670af0fdde431d9c2
Merge: f75f964ba40b7bdd1911842bc43b4df095aee583 bf1939798ffaa7a62b9866ba8b9d782cae963b90
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Tue Feb 22 08:37:34 2011 +1300

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

commit f75f964ba40b7bdd1911842bc43b4df095aee583
Merge: febba50ba8e76e3e892946f819f1db14105aa807 fc1b7201c55d00d6c43a0ecc04bee09cd0e0bde7
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Tue Feb 22 08:37:25 2011 +1300

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

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

Summary of changes:
 acqui/neworderempty.pl                             |   33 ++++++++++++++-
 koha-tmpl/intranet-tmpl/prog/en/modules/about.tmpl |    4 +-
 .../en/modules/acqui/neworderempty_duplicate.tmpl  |   43 ++++++++++++++++++++
 .../prog/en/modules/opac-results-grouped.tmpl      |   17 +++++--
 4 files changed, 88 insertions(+), 9 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty_duplicate.tmpl


hooks/post-receive
-- 
main Koha release repository