[commits] Horde branch master updated. 5d7ca028e6fa4c639d3d75e94b6dbd80fcad3d37

[Michael M Slusarz]

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

from: 5e7c4e39b0d37f1a9d1beb7769e48fb266b7c77a

5d7ca02 Fix bad merge

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

commit 5d7ca028e6fa4c639d3d75e94b6dbd80fcad3d37
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Mar 28 23:25:11 2012 -0600

    Fix bad merge

 framework/Mime_Viewer/lib/Horde/Mime/Viewer/Html.php |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

http://git.horde.org/horde-git/-/commit/5d7ca028e6fa4c639d3d75e94b6dbd80fcad3d37