[commits] Horde branch master updated. 2a925e59c82ee029fff097f55acc984d6faa432c

[Michael J. Rubinsky]

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

from: 5f3c55b8d1ff39e25d85f21eab805e79db0dbc87

5f7e450 Revert "Revert "Prevent the folder cache from being overwritten.""
2a925e5 Correctly fix Bug: 13273

Summary: http://github.com/horde/horde/compare/5f3c55b8d1ff39e25d85f21eab805e79db0dbc87...2a925e59c82ee029fff097f55acc984d6faa432c

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

commit 5f7e450d5adbed7fa417f734a143ebfffb94b8ed
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Tue Aug 19 19:11:32 2014 -0400

    Revert "Revert "Prevent the folder cache from being overwritten.""
    
    This reverts commit 5f3c55b8d1ff39e25d85f21eab805e79db0dbc87.

 framework/ActiveSync/lib/Horde/ActiveSync/Collections.php |    8 +++++++-
 framework/ActiveSync/lib/Horde/ActiveSync/SyncCache.php   |   12 ++++++++++++
 2 files changed, 19 insertions(+), 1 deletions(-)

http://github.com/horde/horde/commit/5f7e450d5adbed7fa417f734a143ebfffb94b8ed

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

commit 2a925e59c82ee029fff097f55acc984d6faa432c
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Tue Aug 19 19:24:22 2014 -0400

    Correctly fix Bug: 13273

 framework/ActiveSync/lib/Horde/ActiveSync/Collections.php  |    8 +++++++-
 framework/ActiveSync/lib/Horde/ActiveSync/Request/Ping.php |    4 ++--
 framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php |   10 +++++-----
 3 files changed, 14 insertions(+), 8 deletions(-)

http://github.com/horde/horde/commit/2a925e59c82ee029fff097f55acc984d6faa432c