Merge pull request #7065 from colemanw/wysiwyg
authorcolemanw <coleman@civicrm.org>
Wed, 28 Oct 2015 00:44:15 +0000 (20:44 -0400)
committercolemanw <coleman@civicrm.org>
Wed, 28 Oct 2015 00:44:15 +0000 (20:44 -0400)
wysiwyg cleanup


Trivial merge