revert bad merge cb9721555f0f1f044ca688c66461ab59b69bbe41
authorKurund Jalmi <kurund@civicrm.org>
Sun, 19 May 2013 05:50:52 +0000 (01:50 -0400)
committerKurund Jalmi <kurund@civicrm.org>
Sun, 19 May 2013 05:50:52 +0000 (01:50 -0400)
commit40a0e8818f3d6c1ea2b0a58eb80fc1ae43e587a8
treeb7b3d01d31e26e69a242ff9000975127d7d34c57
parentcb9721555f0f1f044ca688c66461ab59b69bbe41
revert bad merge cb9721555f0f1f044ca688c66461ab59b69bbe41
templates/CRM/common/wysiwyg.tpl