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

[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  1edf825fa1e439b2ced523e22174ad1e6d8971bc (commit)
       via  4cef5ec9611cc2fbbd245472b60e1580f6f8b4b5 (commit)
       via  d9de6ebab3ecca5e967c658541c0ec62db0ae2e7 (commit)
      from  9ec8a89e51c4896c419f53792d4cc76e09997c9f (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 1edf825fa1e439b2ced523e22174ad1e6d8971bc
Merge: 4cef5ec9611cc2fbbd245472b60e1580f6f8b4b5 d9de6ebab3ecca5e967c658541c0ec62db0ae2e7
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Sun Nov 14 09:42:23 2010 +1300

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

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

Summary of changes:
 acqui/acqui-home.pl                                |    6 +++-
 .../prog/en/includes/acquisitions-menu.inc         |    5 +--
 .../prog/en/modules/acqui/acqui-home.tmpl          |    9 +++++
 t/{00-valid-xml.t => 00-merge-conflict-markers.t}  |   35 ++++++++++++++------
 4 files changed, 40 insertions(+), 15 deletions(-)
 copy t/{00-valid-xml.t => 00-merge-conflict-markers.t} (53%)


hooks/post-receive
-- 
main Koha release repository