[commits] Horde branch master updated. 1fc87b48d0fbd9b2ceea6367a059249202d2f7a3

[Michael J. Rubinsky]

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

from: 8a93cb4f5f304879d0d545e38da9a0151ce979dd

3902eb2 Bug: 12970  Don't overwrite sticky OPTIONS.
baff16b BFN
4797c72 This is not needed.
c0d0533 Specs say we should send the folder class here too.
884a89c Reorder these blocks as the specs say they should appear.
a4d483c ws
1fc87b4 Send server changes first, as specified by the specs.

Summary: http://github.com/horde/horde/compare/8a93cb4f5f304879d0d545e38da9a0151ce979dd...1fc87b48d0fbd9b2ceea6367a059249202d2f7a3

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

commit 3902eb2f42197aea6d291816ae204711ff96edb7
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Wed Oct 29 13:03:03 2014 -0400

    Bug: 12970  Don't overwrite sticky OPTIONS.

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

http://github.com/horde/horde/commit/3902eb2f42197aea6d291816ae204711ff96edb7

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

commit baff16baa1eacdcb7b911207ece84405dc773768
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Wed Oct 29 13:04:30 2014 -0400

    BFN

 framework/ActiveSync/package.xml |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

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

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

commit 4797c726b2fc6202b3546118c655e0ad9f728b64
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Wed Oct 29 14:46:43 2014 -0400

    This is not needed.

 framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)

http://github.com/horde/horde/commit/4797c726b2fc6202b3546118c655e0ad9f728b64

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

commit c0d0533a8111d3284425ccbce892ec17197704b5
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Wed Oct 29 14:47:05 2014 -0400

    Specs say we should send the folder class here too.

 framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

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

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

commit 884a89ceb860470c78be41dcc69ffda4962a9049
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Wed Oct 29 14:50:23 2014 -0400

    Reorder these blocks as the specs say they should appear.

 framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php |   54 ++++++------
 1 files changed, 27 insertions(+), 27 deletions(-)

http://github.com/horde/horde/commit/884a89ceb860470c78be41dcc69ffda4962a9049

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

commit a4d483cc7daab01b1bac22143b5d4e60cb5af741
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Wed Oct 29 15:48:28 2014 -0400

    ws

 framework/ActiveSync/lib/Horde/ActiveSync/Collections.php |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

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

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

commit 1fc87b48d0fbd9b2ceea6367a059249202d2f7a3
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Wed Oct 29 16:54:31 2014 -0400

    Send server changes first, as specified by the specs.

 framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php |   67 ++++++------
 1 files changed, 34 insertions(+), 33 deletions(-)

http://github.com/horde/horde/commit/1fc87b48d0fbd9b2ceea6367a059249202d2f7a3