[koha-commits] main Koha release repository branch master updated. v3.12.00-alpha2-115-g78395e4

[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  78395e4db405b861e14e970f30922c42ffb98e42 (commit)
       via  2b057da0d578964e67a29776a4d1c9e4ac45b14b (commit)
       via  719044f7712191c2749256f6c62fae5eaaf1a0f9 (commit)
       via  6e1ec2472a140103d55bdaf4cf9fe661485b5af7 (commit)
       via  1c203fb8859c8e8233ef038e66fd2210209c72ae (commit)
       via  5b4752e027ce32492166c7018d44d4a687afae36 (commit)
       via  574e2f9d6001c951145ce18c6e56424f94b71b91 (commit)
       via  f35dbbf42eb7f5f9a1412d13a487e0e8eed65ef0 (commit)
       via  8ad00bc02ff23e0dad6661da9ff6b11745cda6f7 (commit)
      from  44e185bf8cc9c0c223849b940b82fa2aa54c498c (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 78395e4db405b861e14e970f30922c42ffb98e42
Merge: 6e1ec24 2b057da
Author: Jared Camins-Esakov <jcamins at cpbibliography.com>
Date:   Fri Mar 22 08:25:21 2013 -0400

    Merge branch 'bug_9257' into 3.12-master

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

Summary of changes:
 C4/Auth.pm                                         |   11 +-
 C4/Branch.pm                                       |   68 +++++---
 C4/Circulation.pm                                  |  191 ++++++++------------
 C4/Overdues.pm                                     |   39 ----
 admin/branches.pl                                  |    3 +
 admin/smart-rules.pl                               |    9 +-
 installer/data/mysql/kohastructure.sql             |    5 +-
 installer/data/mysql/updatedatabase.pl             |   23 +++
 .../prog/en/modules/admin/branches.tt              |    8 +
 .../prog/en/modules/admin/smart-rules.tt           |    3 +
 koha-tmpl/opac-tmpl/ccsr/en/includes/masthead.inc  |   29 +++-
 koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc  |   21 ++-
 kohaversion.pl                                     |    2 +-
 opac/opac-search.pl                                |   16 ++
 t/db_dependent/Circulation_issuingrules.t          |  123 +++++++++++++
 t/db_dependent/lib/KohaTest/Overdues.pm            |    1 -
 16 files changed, 354 insertions(+), 198 deletions(-)
 create mode 100644 t/db_dependent/Circulation_issuingrules.t


hooks/post-receive
-- 
main Koha release repository