[commits] Horde branch master updated. cc88e5476914a6f6a41837a71ca4a5bffa8375b8

Wed Oct 29 23:29:17 UTC 2014

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

from: f51ae8503ae4d4bd2a667f78578b834401569df0

b5fc1d2 Revert "Bug: 12970  Don't overwrite sticky OPTIONS."
cc88e54 Proper fix for Bug: 12970

Summary: http://github.com/horde/horde/compare/f51ae8503ae4d4bd2a667f78578b834401569df0...cc88e5476914a6f6a41837a71ca4a5bffa8375b8

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

commit b5fc1d2b2af1132651cd20856c91c5788e8cd42a
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Wed Oct 29 19:27:25 2014 -0400

    Revert "Bug: 12970  Don't overwrite sticky OPTIONS."

    This reverts commit 3902eb2f42197aea6d291816ae204711ff96edb7.

    Conflicts:
    	framework/ActiveSync/lib/Horde/ActiveSync/Collections.php

 framework/ActiveSync/lib/Horde/ActiveSync/Collections.php  |   24 +++---------
 framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php |    5 --
 2 files changed, 6 insertions(+), 23 deletions(-)

http://github.com/horde/horde/commit/b5fc1d2b2af1132651cd20856c91c5788e8cd42a

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

commit cc88e5476914a6f6a41837a71ca4a5bffa8375b8
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Wed Oct 29 19:28:35 2014 -0400

    Proper fix for Bug: 12970

 framework/ActiveSync/lib/Horde/ActiveSync/Collections.php  |   30 ++++++++++++
 framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php |    7 ++-
 2 files changed, 34 insertions(+), 3 deletions(-)

http://github.com/horde/horde/commit/cc88e5476914a6f6a41837a71ca4a5bffa8375b8