Merge remote branch 'colin/QA/bug_4506' into new/enh/bug_4506

author Chris Cormack <chrisc@catalyst.net.nz>

Tue, 14 Dec 2010 08:07:15 +0000 (21:07 +1300)

committer Chris Cormack <chrisc@catalyst.net.nz>

Tue, 14 Dec 2010 08:07:15 +0000 (21:07 +1300)
author Chris Cormack <chrisc@catalyst.net.nz>
Tue, 14 Dec 2010 08:07:15 +0000 (21:07 +1300)
committer Chris Cormack <chrisc@catalyst.net.nz>
Tue, 14 Dec 2010 08:07:15 +0000 (21:07 +1300)
diff --cc koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
Simple merge
diff --cc koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl
Simple merge
diff --cc koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl
Simple merge
author	Chris Cormack <chrisc@catalyst.net.nz>
	Tue, 14 Dec 2010 08:07:15 +0000 (21:07 +1300)
committer	Chris Cormack <chrisc@catalyst.net.nz>
	Tue, 14 Dec 2010 08:07:15 +0000 (21:07 +1300)
		1	2
koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl	patch \|	diff1 \|	diff2 \|	blob \| history
koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl	patch \|	diff1 \|	diff2 \|	blob \| history
koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl	patch \|	diff1 \|	diff2 \|	blob \| history