[koha-commits] main Koha release repository branch master updated. v3.08.00-1634-gce6f2cb

[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  ce6f2cb74f78196e8d80a8b9acf27060e5fa09eb (commit)
       via  3637c5c3896dd91b318abc0799cc6840c4cc451f (commit)
       via  1fd8ff155afed452acac530a99b267c31030a842 (commit)
       via  95077493bd57d0a0a0f9e4dc08eeaa5a1828f26a (commit)
       via  1b4a26691529eec39319585f12a67575ca2b476d (commit)
       via  ddca23762d8647e4e9937259001586fcf22ad721 (commit)
       via  03acc19c7fa2cfbfd5b7edf50e0e2b99805628d6 (commit)
      from  704de197eadc66dabe3aeaa1b2f02f3c7c16179f (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 ce6f2cb74f78196e8d80a8b9acf27060e5fa09eb
Merge: 1fd8ff1 3637c5c
Author: Jared Camins-Esakov <jcamins at cpbibliography.com>
Date:   Thu Jan 24 09:26:37 2013 -0500

    Merge branch 'bug_7243' into 3.12-master

commit 1fd8ff155afed452acac530a99b267c31030a842
Merge: ddca237 9507749
Author: Jared Camins-Esakov <jcamins at cpbibliography.com>
Date:   Thu Jan 24 09:17:33 2013 -0500

    Merge branch 'bug_7243' into 3.12-master

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

Summary of changes:
 C4/Circulation.pm                                  |   31 +++++----
 C4/Members.pm                                      |   63 +++++++++++++++-----
 circ/circulation.pl                                |   17 ++----
 installer/data/mysql/sysprefs.sql                  |    2 +
 installer/data/mysql/updatedatabase.pl             |   10 +++-
 .../prog/en/includes/subtypes_unimarc.inc          |    4 +-
 .../en/modules/admin/preferences/circulation.pref  |   12 ++++
 .../prog/en/modules/circ/circulation.tt            |    4 +
 .../prog/en/includes/subtypes_unimarc.inc          |    4 +-
 kohaversion.pl                                     |    2 +-
 opac/opac-user.pl                                  |    1 -
 t/db_dependent/lib/KohaTest/Members.pm             |    1 +
 12 files changed, 103 insertions(+), 48 deletions(-)


hooks/post-receive
-- 
main Koha release repository