Possible fix for CRM-12589
Merge pull request #794 from colemanw/tinymce

Possible fix for CRM-12589
revert bad merge cb9721555f0f1f044ca688c66461ab59b69bbe41
Merge pull request #796 from kurund/CRM-12589

reverted bad merge cb9721555f0f1f044ca688c66461ab59b69bbe41
Merge branch '4.3' of git://github.com/civicrm/civicrm-core into CRM-12470