[koha-commits] main Koha release repository branch, master, updated. html_template_pro-302-g7cfa1ca

[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  7cfa1ca50938f597ddb21b0a81a0597d60ed06d1 (commit)
       via  49af98afd7dd0a48605a3d77dcc6b24c9b9b549c (commit)
      from  d00d0721b2898481e148480906502c5445cc4dec (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 7cfa1ca50938f597ddb21b0a81a0597d60ed06d1
Merge: d00d0721b2898481e148480906502c5445cc4dec 49af98afd7dd0a48605a3d77dcc6b24c9b9b549c
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Thu Apr 14 14:41:25 2011 +1200

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

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

Summary of changes:
 circ/circulation.pl                                |    2 +-
 .../prog/en/modules/circ/circulation.tt            |   37 ++++++++-----------
 .../prog/en/modules/members/moremember.tt          |   23 ++++--------
 members/moremember.pl                              |    2 +-
 4 files changed, 26 insertions(+), 38 deletions(-)


hooks/post-receive
-- 
main Koha release repository