Merge remote branch 'kc/new/bug_4912' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Fri, 8 Apr 2011 01:02:55 +0000 (13:02 +1200)
committerChris Cormack <chrisc@catalyst.net.nz>
Fri, 8 Apr 2011 01:02:55 +0000 (13:02 +1200)
commitf098258e8cf2d616c6bbc35e44c6a1df47be8517
treec2ca4cedcb393ea1fe58f7697de82c1e1bbb252f
parent913d520be7fddb8664753fa202f4f0362634c833
parentd269389839415ce4d14f7bc01635978807374631
Merge remote branch 'kc/new/bug_4912' into kcmaster
koha-tmpl/opac-tmpl/prog/en/css/opac.css
koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl