[koha-commits] main Koha release repository branch master updated. v3.04.00-560-g6499cfc

[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  6499cfc2c090b79516fa55ee23abbe1cda357150 (commit)
       via  7cc412d337245b5ffbbb94b5c503e6afd989a3ed (commit)
       via  7e8381c78c6ccffbe6d41d700fa46aa3ed8025ff (commit)
       via  143e3e6541b829c8c7e476526348502b05b204ee (commit)
       via  4324377c55f3c82f724fc08c364eb678ab0f5ffa (commit)
      from  caae541135dedb5d0ccddbf8ffd31887f802332d (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 6499cfc2c090b79516fa55ee23abbe1cda357150
Merge: caae541 7cc412d
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Thu Sep 15 08:42:56 2011 +1200

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

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

Summary of changes:
 C4/Form/MessagingPreferences.pm                    |    4 +-
 cataloguing/addbiblio.pl                           |    2 +-
 .../prog/en/includes/doc-head-open.inc             |    2 +-
 .../prog/en/includes/messaging-preference-form.inc |   68 ++++++++++++++++----
 .../prog/en/modules/cataloguing/addbiblio.tt       |    8 ++-
 .../opac-tmpl/prog/en/modules/opac-messaging.tt    |   49 +++++++++++---
 6 files changed, 103 insertions(+), 30 deletions(-)


hooks/post-receive
-- 
main Koha release repository