Merge remote branch 'kc/new/bug_4885' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Sun, 27 Feb 2011 21:11:09 +0000 (10:11 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Sun, 27 Feb 2011 21:11:09 +0000 (10:11 +1300)
Conflicts:
opac/opac-detail.pl

1  2 
opac/opac-detail.pl

Simple merge