Merge pull request #6172 from colemanw/CRM-16811
authorDave Greenberg <dave@civicrm.org>
Wed, 8 Jul 2015 21:42:50 +0000 (14:42 -0700)
committerDave Greenberg <dave@civicrm.org>
Wed, 8 Jul 2015 21:42:50 +0000 (14:42 -0700)
CRM-16811 - Support markup fields in popup profile editor


Trivial merge