From: Chris Cormack <chrisc@catalyst.net.nz>
Date: Fri, 21 Oct 2011 17:36:36 +0000 (+1300)
Subject: Merge remote-tracking branch 'kc/new/bug_5995' into kcmaster
X-Git-Tag: v3.06.00~6
X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=commitdiff_plain;h=c8df6bdcc9fe2523a77c839270b31304d8e13ee5;p=srvgit

Merge remote-tracking branch 'kc/new/bug_5995' into kcmaster

Conflicts:
	opac/sco/sco-main.pl
---

c8df6bdcc9fe2523a77c839270b31304d8e13ee5