[commits] Horde branch imp_6_1 updated. 6a69fc5b00e52a4c6a06cf5fa3114449cc230333

[Michael M Slusarz]

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

from: bf0a7d249dd6f9295b1da6f60da6736b048be5e2

c5fafd7 Revert "Fix detecting logic error from authentication error"
6a69fc5 Merge branch 'master' into imp_6_1

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

commit c5fafd7c9c01b0919686f97717fbcdb36d9bc794
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sat Feb 16 23:25:29 2013 -0700

    Revert "Fix detecting logic error from authentication error"
    
    This reverts commit 7714cce7b7887d8c2bd2e229c1357850f54dbbe8.
    
    Revert this in IMP 6.0 only.

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

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

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

commit 6a69fc5b00e52a4c6a06cf5fa3114449cc230333
Merge: bf0a7d2 c5fafd7
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sat Feb 16 23:26:30 2013 -0700

    Merge branch 'master' into imp_6_1
    
    Conflicts:
    	imp/lib/Imap.php


http://git.horde.org/horde-git/-/commit/6a69fc5b00e52a4c6a06cf5fa3114449cc230333