[koha-commits] main Koha release repository branch master updated. v3.06.00-255-ga1ec828

[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  a1ec82845372cd888021220f056d465e9e65f4f2 (commit)
       via  3ae23cd6cf97ffbab6080f255e942f2ba73dcd07 (commit)
       via  0ad7e76cb7cebf16310a95377f88047f09b66d24 (commit)
      from  8a87f15605b23c44a8dac71cd4a3f209add98556 (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 a1ec82845372cd888021220f056d465e9e65f4f2
Merge: 0ad7e76 3ae23cd
Author: Paul Poulain <paul.poulain at biblibre.com>
Date:   Fri Dec 16 15:45:12 2011 +0100

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

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

Summary of changes:
 C4/Templates.pm          |   53 ++++++++++++++++++++++++++-------------------
 catalogue/search.pl      |    2 +-
 opac/opac-search.pl      |    2 +-
 t/SIP_ILS.t              |   16 -------------
 t/db_dependent/SIP_ILS.t |   29 +++++++++++++++++++++++++
 5 files changed, 62 insertions(+), 40 deletions(-)
 delete mode 100755 t/SIP_ILS.t
 create mode 100755 t/db_dependent/SIP_ILS.t


hooks/post-receive
-- 
main Koha release repository