[commits] Horde branch master updated. 93d602d22ffa644350991e83c6eaa96a831ebca8

[Michael M Slusarz]

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

from: a4eebc89ef07c23ff6d94cd291d376fd1ff0c860

93d602d ANOTHER part of the botched merge

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

commit 93d602d22ffa644350991e83c6eaa96a831ebca8
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Feb 15 17:24:01 2012 -0700

    ANOTHER part of the botched merge

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

http://git.horde.org/horde-git/-/commit/93d602d22ffa644350991e83c6eaa96a831ebca8