[commits] Horde branch master updated. f438845b7cdc8863579e27584ee642aec6e53d16

[Michael M Slusarz]

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

from: 11974cb98ca94af32e7580790df18f1f051f46b7

d4ed0ce Make headers more visible in flag management view
f438845 Bug #11059: Yet more botched merge fixes.

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

commit d4ed0cebd6cbe97b7c8f0c8762dd28733580170e
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Mar 7 11:03:31 2012 -0700

    Make headers more visible in flag management view

 imp/themes/default/screen.css |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

http://git.horde.org/horde-git/-/commit/d4ed0cebd6cbe97b7c8f0c8762dd28733580170e

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

commit f438845b7cdc8863579e27584ee642aec6e53d16
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Mar 7 13:31:12 2012 -0700

    Bug #11059: Yet more botched merge fixes.

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

http://git.horde.org/horde-git/-/commit/f438845b7cdc8863579e27584ee642aec6e53d16