Merge pull request #7206 from colemanw/wysiwyg
authorcolemanw <coleman@civicrm.org>
Fri, 13 Nov 2015 22:02:12 +0000 (17:02 -0500)
committercolemanw <coleman@civicrm.org>
Fri, 13 Nov 2015 22:02:12 +0000 (17:02 -0500)
wysiwyg fixes


Trivial merge