[commits] Horde branch master updated. 14cb22fa1eec0214884b5efcc2595882b7ae37cf

[Michael M Slusarz]

The branch "master" has been updated.
The following is a summary of the commits.

from: de142d0993ee46770562da9b9d38a02cece42d0d

3ce5807 Force pasting of plaintext into CKEditor
a9f8da6 Fix loading CKEDITOR config in basic view
14cb22f Fix formatting

-----------------------------------------------------------------------

commit 3ce5807dd8bc83755027a21d4f1095d03d3dafab
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Jun 24 13:38:11 2013 -0600

    Force pasting of plaintext into CKEditor

 imp/config/prefs.php                   |    2 +-
 imp/lib/Script/Package/ComposeBase.php |    1 +
 2 files changed, 2 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/3ce5807dd8bc83755027a21d4f1095d03d3dafab

-----------------------------------------------------------------------

commit a9f8da6d513da348fec4e3e61fc19aaab29b2c3d
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Jun 24 13:38:30 2013 -0600

    Fix loading CKEDITOR config in basic view

 imp/lib/Basic/Compose.php               |    8 ++++----
 imp/lib/Dynamic/Compose/Common.php      |    4 ++--
 imp/lib/Editor.php                      |    9 ++++-----
 imp/lib/Prefs/Special/HtmlSignature.php |    2 +-
 4 files changed, 11 insertions(+), 12 deletions(-)

http://git.horde.org/horde-git/-/commit/a9f8da6d513da348fec4e3e61fc19aaab29b2c3d

-----------------------------------------------------------------------

commit 14cb22fa1eec0214884b5efcc2595882b7ae37cf
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Jun 24 13:39:46 2013 -0600

    Fix formatting

 imp/templates/basic/compose/compose.html.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/14cb22fa1eec0214884b5efcc2595882b7ae37cf