From: colemanw <coleman@civicrm.org>
Date: Mon, 4 Jan 2016 20:55:35 +0000 (-0500)
Subject: Merge pull request #7531 from JKingsnorth/CRM-17261
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=bb1a46c7eb2aa98e2833eb0a7b82dd76380d73ab;p=civicrm-core.git

Merge pull request #7531 from JKingsnorth/CRM-17261

CRM-17261: Remove broken IDs from non-location elements on merge screen
---

bb1a46c7eb2aa98e2833eb0a7b82dd76380d73ab