[commits] Horde branch master updated. 1d64950241570933b1b03347e004ca778c700670

Fri Oct 26 21:00:03 UTC 2012

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

from: cb9ed6328a54cd2e014696a66b82ba16d25f5792

1d64950 Bug #11580: Fix bad partial merge

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

commit 1d64950241570933b1b03347e004ca778c700670
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Fri Oct 26 14:53:02 2012 -0600

    Bug #11580: Fix bad partial merge

    A portion of the code needed ended up in
    b6ace0a8a3ef916a5fe4919305d349bc9fbc2b30, which currently only lives in
    the imap_client_move branch.

 framework/Imap_Client/lib/Horde/Imap/Client/Ids.php          |    9 +++++++--
 framework/Imap_Client/lib/Horde/Imap/Client/Search/Query.php |    4 ++--
 framework/Imap_Client/lib/Horde/Imap/Client/Socket.php       |   10 ++++------
 3 files changed, 13 insertions(+), 10 deletions(-)

http://git.horde.org/horde-git/-/commit/1d64950241570933b1b03347e004ca778c700670