Merge pull request #6164 from colemanw/CRM-16354
authorcolemanw <coleman@civicrm.org>
Tue, 7 Jul 2015 18:56:52 +0000 (14:56 -0400)
committercolemanw <coleman@civicrm.org>
Tue, 7 Jul 2015 18:56:52 +0000 (14:56 -0400)
CRM-16354 Upgrade CKEditor to v4.5


Trivial merge