git.koha-community.org Git - koha.git/commit

author	Chris Cormack <chrisc@catalyst.net.nz>
	Sun, 27 Feb 2011 21:11:09 +0000 (10:11 +1300)
committer	Chris Cormack <chrisc@catalyst.net.nz>
	Sun, 27 Feb 2011 21:11:09 +0000 (10:11 +1300)
commit	b5ee2f201bed91a38ff2c1c527cbf19adc76fabc
tree	704cf9c37f5b9d01484a0b248373b5e4d2038235	tree \| snapshot
parent	aaa0cdb9e82930b2d920ee02b71673e6e236b5f8	commit \| diff
parent	baec90aae9359709abc9c18f8b2de0f446bf194a	commit \| diff

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

Conflicts:
opac/opac-detail.pl