[commits] Horde branch master updated. 7079a9ff554e1ea8b2e17678512c463fadbf80b2

[Jan Schneider]

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

from: b44214c3d5c16f2960cd192c4aa4635b8018e84f

7079a9f Revert "Disable backends entry via property, not conf.php value"

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

commit 7079a9ff554e1ea8b2e17678512c463fadbf80b2
Author: Jan Schneider <jan at horde.org>
Date:   Mon Feb 14 22:55:41 2011 +0100

    Revert "Disable backends entry via property, not conf.php value"
    
    If this is going to change, after some discussion, then it needs to
    changed consistently across the board.
    
    This reverts commit 60da4f3ba0d617ff57fd7307912bae63bc20de8f.
    
    Conflicts:
    
    	imp/lib/Imap.php

 imp/config/backends.php |   12 ------------
 imp/config/conf.xml     |    5 +++++
 imp/lib/Application.php |   17 +++++++++++++++++
 imp/lib/Imap.php        |    3 ++-
 4 files changed, 24 insertions(+), 13 deletions(-)

http://git.horde.org/horde-git/-/commit/7079a9ff554e1ea8b2e17678512c463fadbf80b2