Merge pull request #7531 from JKingsnorth/CRM-17261
authorcolemanw <coleman@civicrm.org>
Mon, 4 Jan 2016 20:55:35 +0000 (15:55 -0500)
committercolemanw <coleman@civicrm.org>
Mon, 4 Jan 2016 20:55:35 +0000 (15:55 -0500)
CRM-17261: Remove broken IDs from non-location elements on merge screen


Trivial merge