From: colemanw <coleman@civicrm.org>
Date: Thu, 24 Mar 2016 14:37:30 +0000 (-0400)
Subject: Merge pull request #8021 from JKingsnorth/CRM-18288
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=a38012804f84a8c30ddea92c51b1825206fd2006;p=civicrm-core.git

Merge pull request #8021 from JKingsnorth/CRM-18288

CRM-18288: Fix mergeBlock JS for location types
---

a38012804f84a8c30ddea92c51b1825206fd2006