[commits] Horde branch master updated. 512a25022a1fa00659372bada8997402a7da01b8

[Jan Schneider]

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

from: 82e9ee939ff022cd58185252cf8905cb10e94ff1

512a250 Revert "[mms] Only store keys in cookie if cookies are in use (Bug #13284; thomas.jarosch at intra2net.com)."

Summary: http://github.com/horde/horde/compare/82e9ee939ff022cd58185252cf8905cb10e94ff1...512a25022a1fa00659372bada8997402a7da01b8

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

commit 512a25022a1fa00659372bada8997402a7da01b8
Author: Jan Schneider <jan at horde.org>
Date:   Fri Jul 4 14:14:08 2014 +0200

    Revert "[mms] Only store keys in cookie if cookies are in use (Bug #13284; thomas.jarosch at intra2net.com)."
    
    This reverts commit 6c501804b267e1559cb16731aaaef9f976ec25fb.
    
    This completely broke authentication with any DAV access.
    
    Conflicts:
    	framework/Secret/package.xml

 framework/Secret/lib/Horde/Secret.php |   24 +++++++++++-------------
 1 files changed, 11 insertions(+), 13 deletions(-)

http://github.com/horde/horde/commit/512a25022a1fa00659372bada8997402a7da01b8