From: Chris Cormack <chrisc@catalyst.net.nz>
Date: Sun, 27 Feb 2011 21:11:09 +0000 (+1300)
Subject: Merge remote branch 'kc/new/bug_4885' into kcmaster
X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=b5ee2f201bed91a38ff2c1c527cbf19adc76fabc;p=koha.git

Merge remote branch 'kc/new/bug_4885' into kcmaster

Conflicts:
	opac/opac-detail.pl
---

b5ee2f201bed91a38ff2c1c527cbf19adc76fabc