[koha-commits] main Koha release repository branch master updated. v3.06.00-250-g42d6b17

[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  42d6b17851626c547481438138ebc592177c4e75 (commit)
       via  9880b3ad050813550338de70dcd52c82fadac376 (commit)
       via  d9f7922ad77406939a5f57a22e9a6474e4c328d3 (commit)
       via  c04e6e3c8f758de6489e6d2ead05ce1419ba6543 (commit)
       via  ac139f8f63c87123aa6ba50759eed44f0016d81b (commit)
       via  b955692c8494a81d46a72efaca9385f980cfd1b1 (commit)
       via  c2bba3ffc89ffae78635bf271eaccce7c60c22df (commit)
       via  081790295661662f3d1f22673b1c44eee030fddb (commit)
       via  1f5f4981c098a7aa2a4323107dd98379a52a4c6e (commit)
       via  17df078261b9054b45f87c42f34d9a9e82fba138 (commit)
       via  2cfb3398cf567c72473a98224a2cb0387e1f7fea (commit)
       via  d831a03fdefc56b5462df08cbe626887291c01c8 (commit)
       via  8374ecbcd68fc0f6f9bc13ed7b45448920490bba (commit)
      from  7698ce6e016d6006449814c9bf73e58dd231fc11 (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 42d6b17851626c547481438138ebc592177c4e75
Author: Paul Poulain <paul.poulain at biblibre.com>
Date:   Thu Dec 15 18:37:39 2011 +0100

    welcome to Marc Balmer, #167

commit 9880b3ad050813550338de70dcd52c82fadac376
Merge: ac139f8 d9f7922
Author: Paul Poulain <paul.poulain at biblibre.com>
Date:   Thu Dec 15 18:33:55 2011 +0100

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

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

Summary of changes:
 C4/Dates.pm                                        |    2 +-
 C4/Koha.pm                                         |    3 +-
 C4/VirtualShelves/Page.pm                          |    4 +-
 admin/preferences.pl                               |    3 +-
 docs/history.txt                                   |    1 +
 .../intranet-tmpl/prog/en/includes/cat-toolbar.inc |    6 ++--
 .../intranet-tmpl/prog/en/includes/circ-menu.inc   |   20 ++++++++++--------
 .../intranet-tmpl/prog/en/includes/circ-menu.tt    |   21 +++++++++++--------
 .../prog/en/modules/catalogue/results.tt           |   10 ++++----
 .../prog/en/modules/virtualshelves/shelves.tt      |    4 +-
 misc/cronjobs/longoverdue.pl                       |    8 ++++++-
 misc/translator/translate                          |    4 +++
 t/db_dependent/Members.t                           |    2 +-
 13 files changed, 52 insertions(+), 36 deletions(-)


hooks/post-receive
-- 
main Koha release repository