Merge pull request #5608 from totten/4.6-ckeditor-upload
authorTim Otten <totten@civicrm.org>
Sat, 11 Apr 2015 04:23:32 +0000 (21:23 -0700)
committerTim Otten <totten@civicrm.org>
Sat, 11 Apr 2015 04:23:32 +0000 (21:23 -0700)
CRM-16253 - crmUiRichtext - Enable file uploads


Trivial merge