Merge remote branch 'kc/new/pending_qa/enh/bug_3644' into kcmaster

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

Sat, 9 Apr 2011 07:16:45 +0000 (19:16 +1200)

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

Sat, 9 Apr 2011 07:16:45 +0000 (19:16 +1200)
author Chris Cormack <chrisc@catalyst.net.nz>
Sat, 9 Apr 2011 07:16:45 +0000 (19:16 +1200)
committer Chris Cormack <chrisc@catalyst.net.nz>
Sat, 9 Apr 2011 07:16:45 +0000 (19:16 +1200)
diff --cc C4/Biblio.pm

index 135dd91,146fc82..7b72411

mode 100644,100755..100755
--- 1/C4/Biblio.pm
--- 2/C4/Biblio.pm
+++ b/C4/Biblio.pm
diff --cc C4/Koha.pm
Simple merge
author	Chris Cormack <chrisc@catalyst.net.nz>
	Sat, 9 Apr 2011 07:16:45 +0000 (19:16 +1200)
committer	Chris Cormack <chrisc@catalyst.net.nz>
	Sat, 9 Apr 2011 07:16:45 +0000 (19:16 +1200)
		1	2
C4/Biblio.pm	patch \|	diff1 \|	diff2 \|	blob \| history
C4/Koha.pm	patch \|	diff1 \|	diff2 \|	blob \| history