[commits] Horde branch master updated. 3531e5b053d8cff1c880bfad26b1f3b1304bae2a

[Michael M Slusarz]

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

from: a0cfa639ea8d383320cc01be3d781aebfed42bb7

3531e5b Fix incomplete merging from a local branch

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

commit 3531e5b053d8cff1c880bfad26b1f3b1304bae2a
Author: Michael M Slusarz <slusarz at curecanti.org>
Date:   Fri May 7 15:59:12 2010 -0600

    Fix incomplete merging from a local branch

 imp/js/fullmessage-dimp.js    |    8 ++++++++
 imp/lib/Views/ShowMessage.php |    2 +-
 2 files changed, 9 insertions(+), 1 deletions(-)

http://git.horde.org/diff.php/imp/js/fullmessage-dimp.js?rt=horde-git&r1=0b88d99844b4d54eab322a7d0abaa4a9dc714655&r2=3531e5b053d8cff1c880bfad26b1f3b1304bae2a
http://git.horde.org/diff.php/imp/lib/Views/ShowMessage.php?rt=horde-git&r1=a0cfa639ea8d383320cc01be3d781aebfed42bb7&r2=3531e5b053d8cff1c880bfad26b1f3b1304bae2a