From: Dave Greenberg <dave@civicrm.org>
Date: Wed, 8 Jul 2015 21:42:50 +0000 (-0700)
Subject: Merge pull request #6172 from colemanw/CRM-16811
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=037aab24169a04d43ea937f6871a2061290dac2e;p=civicrm-core.git

Merge pull request #6172 from colemanw/CRM-16811

CRM-16811 - Support markup fields in popup profile editor
---

037aab24169a04d43ea937f6871a2061290dac2e