[commits] Horde branch FRAMEWORK_4 updated. 58956674df9ea4363187acdce15f25dcf4e113bc

[Michael M Slusarz]

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

from: 314bfcb1e9e695a9c8223f656d3cfd03e1bd9191

55810e7 htmlencode compose attachment name
5895667 Merge from master: unescape HTML encoded JSON data

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

commit 55810e787b4c51aa6afe5f82bb3180e9b7ebb60e
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Oct 30 06:39:22 2012 -0600

    htmlencode compose attachment name
    
    This is not an issue in master

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

http://git.horde.org/horde-git/-/commit/55810e787b4c51aa6afe5f82bb3180e9b7ebb60e

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

commit 58956674df9ea4363187acdce15f25dcf4e113bc
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Oct 30 06:39:37 2012 -0600

    Merge from master: unescape HTML encoded JSON data

 imp/js/compose-dimp.js |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/58956674df9ea4363187acdce15f25dcf4e113bc