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

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

Wed, 6 Apr 2011 22:41:37 +0000 (10:41 +1200)

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

Wed, 6 Apr 2011 22:41:37 +0000 (10:41 +1200)
author Chris Cormack <chrisc@catalyst.net.nz>
Wed, 6 Apr 2011 22:41:37 +0000 (10:41 +1200)
committer Chris Cormack <chrisc@catalyst.net.nz>
Wed, 6 Apr 2011 22:41:37 +0000 (10:41 +1200)
diff --cc koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl

index 64c2fb7,e508830..7906c55

mode 100755,100644..100755
--- 1/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
--- 2/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
diff --cc koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl
Simple merge
author	Chris Cormack <chrisc@catalyst.net.nz>
	Wed, 6 Apr 2011 22:41:37 +0000 (10:41 +1200)
committer	Chris Cormack <chrisc@catalyst.net.nz>
	Wed, 6 Apr 2011 22:41:37 +0000 (10:41 +1200)
		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