From: Chris Cormack <chrisc@catalyst.net.nz>
Date: Wed, 10 Nov 2010 22:33:10 +0000 (+1300)
Subject: Merge remote branch 'kc/master' into new/bug_5105
X-Git-Url: http://git.rot13.org/?p=koha.git;a=commitdiff_plain;h=dcb86689f73089ceaa789a92c34e78200d05af61

Merge remote branch 'kc/master' into new/bug_5105

Conflict fixed

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

dcb86689f73089ceaa789a92c34e78200d05af61