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

[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  0fe805b5432a3cebd46ec917f1aa768b3a941fa4 (commit)
       via  cefa7c21e28b88351ee8ae0dfefb80a515323df9 (commit)
       via  34fb8a87f2ccc89517dd7862ec672aa6c8c1997a (commit)
       via  2a7d29beb3f7ef2dd5e83ff0e35d19ca8bcfe82e (commit)
       via  1cb51d7685a4d2fb4228dbb567aa03808b721d54 (commit)
       via  b8c8856840ebcef2639274be2424e783e476fa67 (commit)
       via  4243b517214f95964c69da269d75f1746b5c897f (commit)
       via  8367e9628b1a334e7c25917ce6761c804bc76776 (commit)
       via  3b0109537849c6c23535b447254922072729ad05 (commit)
      from  af89f98a7a82e098a5248c4f2d3c9ff3cd5de201 (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 0fe805b5432a3cebd46ec917f1aa768b3a941fa4
Merge: 34fb8a8 cefa7c2
Author: Jared Camins-Esakov <jcamins at cpbibliography.com>
Date:   Thu Mar 21 20:21:58 2013 -0400

    Merge branch 'bug_5635' into 3.12-master

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

Summary of changes:
 C4/AuthoritiesMarc.pm                              |    4 +-
 .../intranet-tmpl/prog/en/css/staff-global.css     |    1 +
 .../prog/en/modules/admin/smart-rules.tt           |  158 +++++++++++---
 misc/migration_tools/bulkmarcimport.pl             |  230 +++++++++++++++-----
 4 files changed, 300 insertions(+), 93 deletions(-)


hooks/post-receive
-- 
main Koha release repository