From: Eileen McNaughton <eileen@mcnaughty.com>
Date: Mon, 5 Mar 2018 07:03:36 +0000 (+1300)
Subject: Merge pull request #11691 from JKingsnorth/CRM-21773
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=7fba87961cc2bff702085ff7985920c8515fecdf;p=civicrm-core.git

Merge pull request #11691 from JKingsnorth/CRM-21773

CRM-21773 Fix merging multi-value custom fields
---

7fba87961cc2bff702085ff7985920c8515fecdf