[koha-commits] main Koha release repository branch master updated. v3.06.00-156-gc0234dd

[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  c0234dd9b9649063acf2617fecf5c6efda38a532 (commit)
       via  e615516952fc77f27f1dac02573879a61d9f1ed7 (commit)
       via  e06f3ee0fa542c2ab511e8fd2e81680d4a675837 (commit)
      from  2e486be5920c0339c69e0a7eeaed6e4554b38565 (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 c0234dd9b9649063acf2617fecf5c6efda38a532
Merge: e06f3ee e615516
Author: Paul Poulain <paul.poulain at biblibre.com>
Date:   Wed Dec 7 18:07:40 2011 +0100

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

commit e06f3ee0fa542c2ab511e8fd2e81680d4a675837
Author: Paul Poulain <paul.poulain at biblibre.com>
Date:   Wed Dec 7 18:04:10 2011 +0100

    Jenkins complaining = fixing number of tests
    
    (see jenkins build http://jenkins.koha-community.org/job/Koha_master/557/#showFailuresLink)

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

Summary of changes:
 .../prog/itemtypeimg/Seshat/archival lDVD.gif      |  Bin 3126 -> 0 bytes
 .../prog}/itemtypeimg/Seshat/archivalDVD.gif       |  Bin 3126 -> 3126 bytes
 t/Boolean.t                                        |    2 +-
 3 files changed, 1 insertions(+), 1 deletions(-)
 delete mode 100644 koha-tmpl/opac-tmpl/prog/itemtypeimg/Seshat/archival lDVD.gif
 copy koha-tmpl/{intranet-tmpl/prog/img => opac-tmpl/prog}/itemtypeimg/Seshat/archivalDVD.gif (100%)


hooks/post-receive
-- 
main Koha release repository