[koha-commits] main Koha release repository branch master updated. v3.04.00-423-g55326fc

[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  55326fc407ff041ae8abfa54683efd08f8e16f3e (commit)
       via  383d0d3a2108a0ebb784937addc85e7a854ea247 (commit)
       via  bd744e6f2af85110cefa8d9e613393a0a517185b (commit)
       via  a94a9f745556d42e5018695dbaa70a72129cc993 (commit)
       via  3731ec80fc407ba4668450b48c9c81b8c0a98460 (commit)
      from  e73965c62f3895d5bdf5ad0a52c89e54e248f8f1 (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 55326fc407ff041ae8abfa54683efd08f8e16f3e
Merge: 383d0d3 bd744e6
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Sun Aug 28 19:34:25 2011 +1200

    Merge remote-tracking branch 'kc/new/bug_6712' into kcmaster

commit 383d0d3a2108a0ebb784937addc85e7a854ea247
Merge: 3731ec8 a94a9f7
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Sun Aug 28 19:34:18 2011 +1200

    Merge remote-tracking branch 'kc/new/bug_6696' into kcmaster

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

Summary of changes:
 .../prog/en/modules/admin/branches.tt              |   10 +++++-----
 .../prog/en/modules/admin/categorie.tt             |    4 ++++
 .../prog/en/modules/circ/circulation.tt            |    4 ----
 .../prog/en/modules/members/memberentrygen.tt      |   20 --------------------
 4 files changed, 9 insertions(+), 29 deletions(-)


hooks/post-receive
-- 
main Koha release repository