[koha-commits] main Koha release repository branch master updated. v3.06.00-153-g2e486be

[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  2e486be5920c0339c69e0a7eeaed6e4554b38565 (commit)
       via  ffb544e8e4a202705c330f0026453cecebe08c71 (commit)
       via  94e1691a74b4698e88781381d17e60f458c6eb35 (commit)
       via  dbe36a2bf361e1cda73f83cc5cfc79e71c6cf216 (commit)
       via  19d071910f0d772741bf3f3c6b6a0f052bf8be75 (commit)
       via  a9bbeae6cc23c9f45474f6665775455ba32b4f22 (commit)
       via  16c51d03762372d40be4ed600dcd9d51557f0854 (commit)
       via  d2c101a8a9a6d8ed8d69c69d0d753a164681b8d7 (commit)
       via  f21577986f8ff5da5fde88deaae2302a8b40dbe7 (commit)
       via  b03cb0d545caf5cbbe5cab80a9fbb4154c56a508 (commit)
       via  39d401a0ce78393491ec248f2472249efe10cbed (commit)
      from  bedb9bef4c93e35c69582503b97eba3cb76b3242 (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 2e486be5920c0339c69e0a7eeaed6e4554b38565
Merge: f215779 ffb544e
Author: Paul Poulain <paul.poulain at biblibre.com>
Date:   Wed Dec 7 16:38:39 2011 +0100

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

commit f21577986f8ff5da5fde88deaae2302a8b40dbe7
Merge: bedb9be b03cb0d
Author: Paul Poulain <paul.poulain at biblibre.com>
Date:   Wed Dec 7 16:03:16 2011 +0100

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

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

Summary of changes:
 koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tt |    2 +-
 t/Boolean.t                                        |    2 +-
 t/TmplToken.t                                      |   22 +++++++++++++++
 t/db_dependent/BackgroundJob.t                     |    6 +++-
 t/db_dependent/External_BakerTaylor.t              |   28 +++++++++++++++++---
 t/db_dependent/Members.t                           |    2 +-
 t/db_dependent/Record.t                            |   10 +++---
 t/db_dependent/SQLHelper.t                         |    6 +---
 t/db_dependent/UploadedFile.t                      |    8 +++--
 9 files changed, 65 insertions(+), 21 deletions(-)
 create mode 100755 t/TmplToken.t


hooks/post-receive
-- 
main Koha release repository