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

[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  c9e4c68d277737c06dc8b73f951d69b1665c5c2a (commit)
       via  8f7189678d47bb0fc0298ca8191b30f280e5beda (commit)
       via  e636bed7287163a1dfeb93c9d2ecbf06002870fb (commit)
       via  88c0c4934cd2558d9393051a49a497ce9b188edb (commit)
       via  2618c055684a685c9f841b58747474a4147a78ac (commit)
       via  6807d7e3383e015ac787bcd327bfd8b512ea2a78 (commit)
       via  7f8369dc2f937db6c4a5f588567f53a447733222 (commit)
       via  520a82a754c1cc3f1b3747dc762aaef45d641ed3 (commit)
       via  a252e417fb24054c447c97fbbb8df9338126be46 (commit)
       via  7ceb9988e935165163a720d265f50646969c55de (commit)
      from  c1f4866312e445117df96b74bce9093fd0b25fa0 (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 c9e4c68d277737c06dc8b73f951d69b1665c5c2a
Merge: 6807d7e 8f71896
Author: Jared Camins-Esakov <jcamins at cpbibliography.com>
Date:   Thu Mar 21 12:02:26 2013 -0400

    Merge branch 'bug_9403' into 3.12-master

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

Summary of changes:
 C4/Circulation.pm                                  |    4 +-
 C4/XSLT.pm                                         |    2 +-
 installer/data/mysql/sysprefs.sql                  |    3 +-
 installer/data/mysql/updatedatabase.pl             |   19 +++
 .../prog/en/modules/admin/preferences/opac.pref    |    7 +-
 .../en/modules/admin/preferences/staff_client.pref |    6 +
 .../intranet-tmpl/prog/en/modules/tools/viewlog.tt |    2 +-
 .../prog/en/xslt/MARC21slim2intranetDetail.xsl     |    6 +-
 .../prog/en/xslt/MARC21slim2intranetResults.xsl    |  142 ++++++++++----------
 .../prog/img}/famfamfam/silk/book.png              |  Bin 593 -> 593 bytes
 .../prog/img}/famfamfam/silk/book_link.png         |  Bin 789 -> 789 bytes
 .../prog/img}/famfamfam/silk/book_open.png         |  Bin 622 -> 622 bytes
 .../prog/img}/famfamfam/silk/computer_link.png     |  Bin 792 -> 792 bytes
 .../prog/img}/famfamfam/silk/film.png              |  Bin 653 -> 653 bytes
 .../prog/img}/famfamfam/silk/map.png               |  Bin 804 -> 804 bytes
 .../prog/img}/famfamfam/silk/music.png             |  Bin 385 -> 385 bytes
 .../prog/img}/famfamfam/silk/newspaper.png         |  Bin 658 -> 658 bytes
 .../prog/img}/famfamfam/silk/report_disk.png       |  Bin 760 -> 760 bytes
 .../prog/img}/famfamfam/silk/sound.png             |  Bin 610 -> 610 bytes
 kohaversion.pl                                     |    2 +-
 20 files changed, 112 insertions(+), 81 deletions(-)
 copy koha-tmpl/{opac-tmpl/lib => intranet-tmpl/prog/img}/famfamfam/silk/book.png (100%)
 copy koha-tmpl/{opac-tmpl/lib => intranet-tmpl/prog/img}/famfamfam/silk/book_link.png (100%)
 copy koha-tmpl/{opac-tmpl/lib => intranet-tmpl/prog/img}/famfamfam/silk/book_open.png (100%)
 copy koha-tmpl/{opac-tmpl/lib => intranet-tmpl/prog/img}/famfamfam/silk/computer_link.png (100%)
 copy koha-tmpl/{opac-tmpl/lib => intranet-tmpl/prog/img}/famfamfam/silk/film.png (100%)
 copy koha-tmpl/{opac-tmpl/lib => intranet-tmpl/prog/img}/famfamfam/silk/map.png (100%)
 copy koha-tmpl/{opac-tmpl/lib => intranet-tmpl/prog/img}/famfamfam/silk/music.png (100%)
 copy koha-tmpl/{opac-tmpl/lib => intranet-tmpl/prog/img}/famfamfam/silk/newspaper.png (100%)
 copy koha-tmpl/{opac-tmpl/lib => intranet-tmpl/prog/img}/famfamfam/silk/report_disk.png (100%)
 copy koha-tmpl/{opac-tmpl/lib => intranet-tmpl/prog/img}/famfamfam/silk/sound.png (100%)


hooks/post-receive
-- 
main Koha release repository