Merge branch 'new/enh/bug_5579' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Wed, 20 Apr 2011 23:48:11 +0000 (11:48 +1200)
committerChris Cormack <chrisc@catalyst.net.nz>
Wed, 20 Apr 2011 23:48:11 +0000 (11:48 +1200)
commitb4d6ad26dc40b2f10c8cdd9d546f60cebfbd4b22
treed53f09d1b66a3cfcaf573d4aeea6dd6a31527faa
parentc58c6c219c196f1a8b2f5d3bb85db6bd9ccb9500
parentce849240ad67131ead68f4339f49e861c6719882
Merge branch 'new/enh/bug_5579' into kcmaster

Conflicts:
C4/Biblio.pm
C4/Biblio.pm