[commits] Horde branch master updated. 17f91201be2a2feae183af7f4041eccac6239062

[Jan Schneider]

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

from: 783a4e66aca2266be97f498e1110275fc8f06f72

0a3d57b Revert "[mms] Fix regression in sending PGP encrypted messages (Bug #11085)."
9b7439e Fix method names.
17f9120 [jan] Fix regression in sending PGP encrypted messages (Bug #11150).

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

commit 0a3d57b3ff73564b79bf35640c3c34bbf9a1732a
Author: Jan Schneider <jan at horde.org>
Date:   Tue Apr 17 15:21:30 2012 +0200

    Revert "[mms] Fix regression in sending PGP encrypted messages (Bug #11085)."
    
    This reverts commit c5540771fc376b2e770d49f8a7a4e0cdfacf65ba.
    
    Conflicts:
    
    	imp/docs/CHANGES
    	imp/lib/Compose.php
    	imp/package.xml

 imp/lib/Compose.php |   29 +++++++++++------------------
 1 files changed, 11 insertions(+), 18 deletions(-)

http://git.horde.org/horde-git/-/commit/0a3d57b3ff73564b79bf35640c3c34bbf9a1732a

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

commit 9b7439e53109cc76be12be775a5495bc9f598990
Author: Jan Schneider <jan at horde.org>
Date:   Tue Apr 17 15:25:14 2012 +0200

    Fix method names.

 imp/lib/Compose.php |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

http://git.horde.org/horde-git/-/commit/9b7439e53109cc76be12be775a5495bc9f598990

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

commit 17f91201be2a2feae183af7f4041eccac6239062
Author: Jan Schneider <jan at horde.org>
Date:   Tue Apr 17 15:26:09 2012 +0200

    [jan] Fix regression in sending PGP encrypted messages (Bug #11150).

 imp/docs/CHANGES |    1 +
 imp/package.xml  |    2 ++
 2 files changed, 3 insertions(+), 0 deletions(-)

http://git.horde.org/horde-git/-/commit/17f91201be2a2feae183af7f4041eccac6239062