[commits] Horde branch master updated. 87305716994e1b66d255d80cdfeccf833a4be125

[Michael M Slusarz]

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

from: aef5a56a6c2e40bcca7ea4f9a213ca9f689ede70

8730571 Another fix for the broken merge

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

commit 87305716994e1b66d255d80cdfeccf833a4be125
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Feb 20 21:36:54 2012 -0700

    Another fix for the broken merge

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

http://git.horde.org/horde-git/-/commit/87305716994e1b66d255d80cdfeccf833a4be125