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

[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  6a37aaf010e3bce1cc28480e97e4f3631ed04cc1 (commit)
       via  b2c56dfe62e90c8f3ae6a81b8d511714a54b6d33 (commit)
       via  3e26abc9cd4fbfbc6e827e2d0656f92c1f00334d (commit)
      from  761fa372977c753483c0b3378967d1f60a2bef2a (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 6a37aaf010e3bce1cc28480e97e4f3631ed04cc1
Merge: 3e26abc9cd4fbfbc6e827e2d0656f92c1f00334d b2c56dfe62e90c8f3ae6a81b8d511714a54b6d33
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Thu Feb 17 08:56:43 2011 +1300

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

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

Summary of changes:
 C4/Form/MessagingPreferences.pm                    |    2 +-
 C4/Members/Messaging.pm                            |    2 +-
 .../intranet-tmpl/prog/en/css/staff-global.css     |    2 +-
 .../prog/en/modules/members/readingrec.tmpl        |   40 +++++++------------
 members/readingrec.pl                              |   16 +------
 5 files changed, 21 insertions(+), 41 deletions(-)


hooks/post-receive
-- 
main Koha release repository