Merge pull request #8021 from JKingsnorth/CRM-18288
authorcolemanw <coleman@civicrm.org>
Thu, 24 Mar 2016 14:37:30 +0000 (10:37 -0400)
committercolemanw <coleman@civicrm.org>
Thu, 24 Mar 2016 14:37:30 +0000 (10:37 -0400)
CRM-18288: Fix mergeBlock JS for location types


Trivial merge