[koha-commits] main Koha release repository branch master updated. v3.06.00-361-g2bfad0f

[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  2bfad0f6f9b23ed8b8882231dd9cc780658575c0 (commit)
       via  6456afea959111b3e0cade89e14251ea8abd5f74 (commit)
       via  02d392a502571e14df9373782343cf5e3bbe83b6 (commit)
       via  d5b1b8ee87b4b9ada7a333401a1586c8b446cb0a (commit)
       via  4cf7cd28dab9485d89ecfe06660f98b2cd374243 (commit)
       via  977e1a401bebbd9259e8702bdab73df0619c6eb1 (commit)
      from  49c352532198e5f9d08e209ae7d25b05eb3d84fc (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 2bfad0f6f9b23ed8b8882231dd9cc780658575c0
Merge: d5b1b8e 6456afe
Author: Paul Poulain <paul.poulain at biblibre.com>
Date:   Tue Jan 17 15:07:09 2012 +0100

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

commit d5b1b8ee87b4b9ada7a333401a1586c8b446cb0a
Merge: 49c3525 4cf7cd2
Author: Paul Poulain <paul.poulain at biblibre.com>
Date:   Tue Jan 17 12:05:00 2012 +0100

    Merge remote-tracking branch 'origin/new/bug_7364'
    
    Conflicts:
    	cataloguing/additem.pl

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

Summary of changes:
 C4/Biblio.pm                          |   59 ++++++++++-----------------------
 cataloguing/additem.pl                |    5 +--
 t/db_dependent/lib/KohaTest/Biblio.pm |    1 -
 3 files changed, 19 insertions(+), 46 deletions(-)


hooks/post-receive
-- 
main Koha release repository