[koha-commits] main Koha release repository branch master updated. v3.04.00-549-g68de42d

[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  68de42d59d7070bc58f25cb13ad159d8c70aafc6 (commit)
       via  362b82c51d1ff4fe6506f7724e8dac7d0a24ebd0 (commit)
       via  9dc11e418a3f48971de92f2722bd564738218c9f (commit)
       via  aab0d9fba264ec3e878e339e098b1f3c943e6a6d (commit)
       via  3e1203c95e53422015885a2add288d5cbc9f8733 (commit)
       via  8bdab59bbad65bdb4b324fedc79c73b33066b0d3 (commit)
       via  0d5aaf0a7ca024d4ec5e1b7d554e0d813785fae4 (commit)
       via  597240e878a2a9808ce103508a42d9ed34a11422 (commit)
       via  e1bbff6b7f9db37714fcdb69b03598600e222237 (commit)
       via  8a4dbae0efee89728de8bc5a63339828498f9798 (commit)
       via  e8a876614eddde3025477e228d4ccf533d3cc683 (commit)
       via  c7c7a09dc49483fa9b9eefb2a24d3bc4aaea5359 (commit)
       via  ecfa1ddd49bd8de6139cd7200679996b51dabf3c (commit)
       via  550a38143a5898dc7c4ef09be215dcb27aab1034 (commit)
       via  2c51064ab183abb3761be629efd4169ebef99d4b (commit)
       via  7950a8f5af10b905d1a53e14e69eb34ad430d29e (commit)
       via  d058b4eee9de75b00d8cb74367bd3ee0bdc2318c (commit)
      from  f8bd9b146076c9620d34a45fed41e4c069e96c32 (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 68de42d59d7070bc58f25cb13ad159d8c70aafc6
Merge: f8bd9b1 362b82c
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Wed Sep 14 10:14:54 2011 +1200

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

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

Summary of changes:
 admin/branches.pl                                  |    6 +-
 admin/patron-attr-types.pl                         |   24 +-
 .../prog/en/includes/budgets-admin-search.inc      |    6 +-
 .../intranet-tmpl/prog/en/includes/header.inc      |    6 +-
 .../intranet-tmpl/prog/en/modules/admin/aqplan.tt  |    8 +-
 .../en/modules/admin/branch_transfer_limits.tt     |    8 +-
 .../prog/en/modules/admin/branches.tt              |    7 +-
 .../prog/en/modules/admin/clone-rules.tt           |   12 +-
 .../prog/en/modules/admin/patron-attr-types.tt     |   46 +++-
 .../prog/en/modules/admin/systempreferences.tt     |   71 ++++-
 .../prog/en/modules/cataloguing/addbiblio.tt       |    1 -
 .../prog/en/modules/labels/spinelabel-print.tt     |    6 +-
 .../prog/en/modules/members/memberentrygen.tt      |  272 ++++++++++++++++----
 .../prog/en/modules/members/moremember.tt          |   14 +-
 .../prog/en/modules/tools/csv-profiles.tt          |    9 +-
 .../prog/en/modules/tools/manage-marc-import.tt    |    4 +-
 .../opac-tmpl/prog/en/modules/opac-reserve.tt      |   33 ++-
 17 files changed, 425 insertions(+), 108 deletions(-)


hooks/post-receive
-- 
main Koha release repository