[koha-commits] main Koha release repository branch master updated. v3.08.00-1316-g6081b94

[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  6081b94e3c3af21e90f14b73611216d1c4cbd31d (commit)
       via  bd63817139f3011afdaa23a93adc41966e28a3f3 (commit)
       via  2bc5b29cc1d7f5e42fb74730d8271741d02bdd9d (commit)
       via  bc9cb5b47828f9920a9485ca2c97cc292bbb30dd (commit)
       via  de235cef33ad8cf7aa76f829def3e3d679d3e351 (commit)
       via  0682139bb8934d3ed4e8243c34c27d0605c652de (commit)
       via  815a9ff1ecfc0119f5d05d80a72524dac4409484 (commit)
      from  18b83eedd37d639f88b658fa412e42c96fb40345 (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 6081b94e3c3af21e90f14b73611216d1c4cbd31d
Merge: bc9cb5b bd63817
Author: Jared Camins-Esakov <jcamins at cpbibliography.com>
Date:   Wed Nov 28 08:24:54 2012 -0500

    Merge branch 'bug_7143' into 3.12-master

commit bc9cb5b47828f9920a9485ca2c97cc292bbb30dd
Merge: 0682139 de235ce
Author: Jared Camins-Esakov <jcamins at cpbibliography.com>
Date:   Wed Nov 28 08:17:58 2012 -0500

    Merge branch 'bug_2832' into 3.12-master

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

Summary of changes:
 koha-tmpl/intranet-tmpl/prog/en/modules/about.tt   |   38 +++++++++++++-------
 .../prog/en/includes/opac-authorities.inc          |    2 +-
 .../prog/en/modules/opac-authorities-home.tt       |    2 +-
 members/members-home.pl                            |    2 +-
 opac/opac-authorities-home.pl                      |    8 ++++-
 5 files changed, 35 insertions(+), 17 deletions(-)


hooks/post-receive
-- 
main Koha release repository