[koha-commits] main Koha release repository branch master updated. v3.08.00-1356-geb570a2

[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  eb570a205206742ffcc03c0c8c99fb1866d733bd (commit)
       via  2a9de22e2aa034e8815666b79713d86ed933b783 (commit)
       via  ca11d0ba2998996bbef39a9a9e2483bba21572d6 (commit)
       via  ef96f0686dbf76bcf133a1923693f30e2ea7212a (commit)
       via  880e3b805b0e2a27052a2900b915eefa2edd03f7 (commit)
       via  fa58f1b5b948292d507756b222c3879bb6e66b8c (commit)
       via  1167677f4b3f875f0a80a00bb2917c3e9ebebf25 (commit)
       via  aad2599fb1ac5c38afcf678e437dcfd3a9c020b0 (commit)
       via  bcd1a05a8f1c954be968c7b1c438288f2a147aec (commit)
       via  7444b82fedeeab312aaf9efe45abdaff4f097eff (commit)
       via  b81156bf0a5fbd1c04f99e58446d6b49332e333e (commit)
       via  0cd32f580241a7282131b3470c7b736d5e43127d (commit)
       via  82eb16325f71b6a72c520e23f1d36f7eb36ecfd0 (commit)
      from  0f6487bc32d80ad91cf11627b8aded8b48ab9c71 (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 eb570a205206742ffcc03c0c8c99fb1866d733bd
Merge: ef96f06 2a9de22
Author: Jared Camins-Esakov <jcamins at cpbibliography.com>
Date:   Fri Nov 30 08:02:14 2012 -0500

    Merge branch 'bug_7189' into 3.12-master

commit ef96f0686dbf76bcf133a1923693f30e2ea7212a
Merge: 1167677 880e3b8
Author: Jared Camins-Esakov <jcamins at cpbibliography.com>
Date:   Fri Nov 30 07:38:55 2012 -0500

    Merge branch 'bug_6945' into 3.12-master

commit 1167677f4b3f875f0a80a00bb2917c3e9ebebf25
Merge: bcd1a05 aad2599
Author: Jared Camins-Esakov <jcamins at cpbibliography.com>
Date:   Fri Nov 30 07:29:15 2012 -0500

    Merge branch 'bug_8032' into 3.12-master

commit bcd1a05a8f1c954be968c7b1c438288f2a147aec
Merge: b81156b 7444b82
Author: Jared Camins-Esakov <jcamins at cpbibliography.com>
Date:   Fri Nov 30 07:14:29 2012 -0500

    Merge branch 'bug_8715' into 3.12-master

commit b81156bf0a5fbd1c04f99e58446d6b49332e333e
Merge: 82eb163 0cd32f5
Author: Jared Camins-Esakov <jcamins at cpbibliography.com>
Date:   Fri Nov 30 07:09:47 2012 -0500

    Merge branch 'bug_8946' into 3.12-master

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

Summary of changes:
 C4/Circulation.pm                                  |   12 ++-
 C4/VirtualShelves.pm                               |    3 +-
 C4/VirtualShelves/Page.pm                          |    3 +
 circ/returns.pl                                    |    3 +
 installer/data/mysql/sysprefs.sql                  |    1 +
 installer/data/mysql/updatedatabase.pl             |    7 ++
 .../prog/en/includes/subtypes_unimarc.inc          |   55 ++++++++------
 .../en/modules/admin/preferences/circulation.pref  |    6 ++
 .../prog/en/modules/catalogue/detail.tt            |    6 ++
 .../intranet-tmpl/prog/en/modules/circ/returns.tt  |    5 +
 .../prog/en/modules/serials/serials-collection.tt  |   82 ++++++++++++++------
 .../prog/en/modules/virtualshelves/shelves.tt      |   10 ++-
 .../prog/en/includes/subtypes_unimarc.inc          |   52 +++++++-----
 .../opac-tmpl/prog/en/modules/opac-shelves.tt      |    2 +
 kohaversion.pl                                     |    2 +-
 reports/dictionary.pl                              |    2 +-
 serials/serials-collection.pl                      |    1 +
 17 files changed, 174 insertions(+), 78 deletions(-)


hooks/post-receive
-- 
main Koha release repository