[koha-commits] main Koha release repository branch master updated. v3.06.00-316-gd57da73

[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  d57da73c2f51d837cb7557d7e8ca368cd74fe5c4 (commit)
       via  35bc73eca324c371982747f2f0454a71a4f46245 (commit)
       via  de5b1d8da6c3b831ff788d5cd95c1d1bb32ca325 (commit)
       via  37f025cf3eae35bb6cdece153e0cb5fb7f1f57c3 (commit)
       via  52098370f51994b4f89f2e2a0dda03a9700aa26f (commit)
       via  a9e080a6fbcdd268a03f82138453bb22224f351b (commit)
       via  67c6c95396fcaeca49da68499b0ceb5b6350b4b8 (commit)
      from  756a1f6b72c976a342b510f3cfc25105f3719cd0 (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 d57da73c2f51d837cb7557d7e8ca368cd74fe5c4
Merge: de5b1d8 35bc73e
Author: Paul Poulain <paul.poulain at biblibre.com>
Date:   Tue Jan 10 23:35:48 2012 +0100

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

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

Summary of changes:
 catalogue/detail.pl                                |    6 +++++-
 circ/circulation.pl                                |    1 +
 circ/returns.pl                                    |    1 +
 etc/zebradb/etc/word-phrase-utf.chr                |    7 ++++++-
 installer/data/mysql/kohastructure.sql             |    2 +-
 installer/data/mysql/sysprefs.sql                  |    4 ++--
 installer/data/mysql/updatedatabase.pl             |    8 ++++++++
 .../intranet-tmpl/prog/en/includes/date-format.inc |    2 +-
 .../en/modules/admin/preferences/i18n_l10n.pref    |    2 +-
 .../prog/en/modules/catalogue/detail.tt            |    7 +++++--
 .../prog/en/modules/catalogue/moredetail.tt        |    1 +
 .../prog/en/modules/circ/circulation.tt            |    7 +++++++
 .../intranet-tmpl/prog/en/modules/circ/returns.tt  |    6 ++++++
 kohaversion.pl                                     |    2 +-
 14 files changed, 46 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
main Koha release repository