[koha-commits] main Koha release repository branch master updated. v3.06.00-142-gbedb9be

[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  bedb9bef4c93e35c69582503b97eba3cb76b3242 (commit)
       via  13f29dd7f36137a77695af6c6eb3032ec72d9ae2 (commit)
       via  046c1cab8cd1bdd356750c837bcdbf1dd06797ff (commit)
       via  6f043aa82f9c8f20bb70081cc86a42026465193a (commit)
       via  d71e696567ac5fec055c7d2b923d1015956c4960 (commit)
      from  924ce3697dc97767f8d2261552da336afb1552ee (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 bedb9bef4c93e35c69582503b97eba3cb76b3242
Merge: 13f29dd 046c1ca
Author: Paul Poulain <paul.poulain at biblibre.com>
Date:   Wed Dec 7 15:58:38 2011 +0100

    Merge remote-tracking branch 'origin/new/bug_6971'

commit 13f29dd7f36137a77695af6c6eb3032ec72d9ae2
Author: Paul Poulain <paul.poulain at biblibre.com>
Date:   Wed Dec 7 15:17:54 2011 +0100

    Test suite: ignoring backups from vi (files ending with a ~)
    
    On my laptop, this test was failing because some scripts had a conflict marker in a backup ... of a conflict I just fixed!
    ignoring any file ending with a ~

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

Summary of changes:
 docs/history.txt                                   |   92 ++++++++++----------
 .../prog/en/xslt/MARC21slim2intranetDetail.xsl     |    8 +-
 .../prog/en/xslt/MARC21slim2OPACDetail.xsl         |    8 +-
 t/00-merge-conflict-markers.t                      |    2 +-
 4 files changed, 56 insertions(+), 54 deletions(-)


hooks/post-receive
-- 
main Koha release repository