Merge branch 'bug_9052' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Sun, 30 Dec 2012 23:36:34 +0000 (18:36 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Sun, 30 Dec 2012 23:36:34 +0000 (18:36 -0500)
commitaa7ac570b2d551ce8c537f0bac31f803c379e6ce
tree733ed97dad35730c44b80593670bcc1201d371d0
parentc784ee479f69105e9865b83b827a0971329120e5
parente24bcabb05d0716711c894f07cf7b05b59bc0086
Merge branch 'bug_9052' into 3.12-master

Conflicts:
koha-tmpl/opac-tmpl/prog/en/css/sco.css
koha-tmpl/opac-tmpl/prog/en/css/sco.css
koha-tmpl/opac-tmpl/prog/en/modules/sco/help.tt
koha-tmpl/opac-tmpl/prog/en/modules/sco/sco-main.tt