Bug 17913: [16.05.x] Authority merge fix
authorMarcel de Rooy <m.de.rooy@rijksmuseum.nl>
Mon, 23 Jan 2017 13:06:48 +0000 (14:06 +0100)
committerMason James <mtj@kohaaloha.com>
Thu, 23 Feb 2017 20:42:24 +0000 (09:42 +1300)
commit0d0c8cf08a93efa8fc6b4404b496fb4d9d17ec47
tree3ee3f0fca709dafe45ac70634a2ca952e575396f
parenta9906d71aac7e7c2e4cc2291d4f4b554892ab49f
Bug 17913: [16.05.x] Authority merge fix

[PUSHED_17.05]

Squashed into one patch for 16.05.x

Signed-off-by: Mason James <mtj@kohaaloha.com>
C4/AuthoritiesMarc.pm
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/authorities.pref
t/db_dependent/Authorities/Merge.t