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

[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  5bdfefc7e1962a64079eb119d5229bfa28cf979d (commit)
       via  827c575b18c0914045b2855b066277f104e22ded (commit)
       via  3291784a88676cadb4ab86b936d14903da01a69e (commit)
       via  e9db636e6321000216151e3bdea400fb638dd288 (commit)
       via  b1daec9fa3aa3636e8f7e6c724305ec4f7e492c1 (commit)
       via  ad206a73f867f6a184f64d41e4ccfa8e5bb0cd21 (commit)
       via  132743f66bc07f6b8799835aac6cf440430bd44e (commit)
       via  706a881b7fc12a0700affd55c289eeffe415a49a (commit)
       via  9cab9be3d6114898e0b8354d784fb8d56ad51fbc (commit)
       via  ce71043216f843ad1b1d2fb254db4dd2635e1066 (commit)
       via  e43da19e34745d734ab6ee5cb5540e4d6e92adf3 (commit)
      from  66de13af9a5b00e70fb93ada6a92f3481db1a981 (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 5bdfefc7e1962a64079eb119d5229bfa28cf979d
Merge: 827c575b18c0914045b2855b066277f104e22ded ce71043216f843ad1b1d2fb254db4dd2635e1066
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Wed Apr 6 15:35:28 2011 +1200

    Merge remote branch 'kc/new/bug_6058' into kcmaster

commit 827c575b18c0914045b2855b066277f104e22ded
Merge: 3291784a88676cadb4ab86b936d14903da01a69e 9cab9be3d6114898e0b8354d784fb8d56ad51fbc
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Wed Apr 6 15:35:25 2011 +1200

    Merge remote branch 'kc/new/bug_6056' into kcmaster

commit 3291784a88676cadb4ab86b936d14903da01a69e
Merge: e9db636e6321000216151e3bdea400fb638dd288 132743f66bc07f6b8799835aac6cf440430bd44e
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Wed Apr 6 15:35:16 2011 +1200

    Merge remote branch 'kc/new/bug_5942' into kcmaster

commit e9db636e6321000216151e3bdea400fb638dd288
Merge: b1daec9fa3aa3636e8f7e6c724305ec4f7e492c1 706a881b7fc12a0700affd55c289eeffe415a49a
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Wed Apr 6 15:35:11 2011 +1200

    Merge remote branch 'kc/new/bug_5914' into kcmaster

commit b1daec9fa3aa3636e8f7e6c724305ec4f7e492c1
Merge: e43da19e34745d734ab6ee5cb5540e4d6e92adf3 ad206a73f867f6a184f64d41e4ccfa8e5bb0cd21
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Wed Apr 6 15:34:56 2011 +1200

    Merge remote branch 'kc/new/bug_5651' into kcmaster

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

Summary of changes:
 C4/Acquisition.pm                                  |    4 +
 C4/AuthoritiesMarc.pm                              |   66 ++--
 C4/Search.pm                                       |    4 +-
 acqui/addorder.pl                                  |    1 +
 .../Obligatoire/autorite_default.sql               |  454 ++++++++++++++++++++
 .../Obligatoire/autorite_default.txt               |    1 +
 .../prog/en/modules/acqui/neworderempty.tmpl       |    2 +-
 misc/migration_tools/merge_authority.pl            |    2 +-
 8 files changed, 499 insertions(+), 35 deletions(-)
 create mode 100644 installer/data/mysql/fr-FR/marcflavour/unimarc_complet/Obligatoire/autorite_default.sql
 create mode 100644 installer/data/mysql/fr-FR/marcflavour/unimarc_complet/Obligatoire/autorite_default.txt


hooks/post-receive
-- 
main Koha release repository