Merge pull request #6212 from colemanw/CRM-16354
authorcolemanw <coleman@civicrm.org>
Tue, 14 Jul 2015 20:04:33 +0000 (16:04 -0400)
committercolemanw <coleman@civicrm.org>
Tue, 14 Jul 2015 20:04:33 +0000 (16:04 -0400)
WYSIWYG upgrades


Trivial merge