[koha-commits] main Koha release repository branch master updated. v3.08.00-1516-gaa7ac57

[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  aa7ac570b2d551ce8c537f0bac31f803c379e6ce (commit)
       via  e24bcabb05d0716711c894f07cf7b05b59bc0086 (commit)
      from  c784ee479f69105e9865b83b827a0971329120e5 (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 aa7ac570b2d551ce8c537f0bac31f803c379e6ce
Merge: c784ee4 e24bcab
Author: Jared Camins-Esakov <jcamins at cpbibliography.com>
Date:   Sun Dec 30 18:36:34 2012 -0500

    Merge branch 'bug_9052' into 3.12-master
    
    Conflicts:
    	koha-tmpl/opac-tmpl/prog/en/css/sco.css

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

Summary of changes:
 koha-tmpl/opac-tmpl/prog/en/css/sco.css            |    6 +++++-
 koha-tmpl/opac-tmpl/prog/en/modules/sco/help.tt    |    2 --
 .../opac-tmpl/prog/en/modules/sco/sco-main.tt      |    2 --
 3 files changed, 5 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
main Koha release repository