[commits] Horde branch master updated. 7dfcba30293aaed2b4afa5ba1ac29b0fdf3d373b

[Jan Schneider]

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

from: c518eed95aa58ecca41187a8316ea684e77f29f6

ed05c75 Revert "Actually return object hash and UIDs (Bug #13269)."
7dfcba3 Fix up broken add/modify operation in Kolab driver

Summary: http://github.com/horde/horde/compare/c518eed95aa58ecca41187a8316ea684e77f29f6...7dfcba30293aaed2b4afa5ba1ac29b0fdf3d373b

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

commit ed05c756e0c320c17356370bb4f25ceb50cd750b
Author: Jan Schneider <jan at horde.org>
Date:   Mon Jun 30 17:54:56 2014 +0200

    Revert "Actually return object hash and UIDs (Bug #13269)."
    
    This reverts commit 395502df660d3ce48d6de5742ddcea0f8bb70f84.

 mnemo/lib/Driver/Kolab.php |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

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

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

commit 7dfcba30293aaed2b4afa5ba1ac29b0fdf3d373b
Author: Thomas Jarosch <thomas.jarosch at intra2net.com>
Date:   Thu Jun 19 16:12:29 2014 +0200

    Fix up broken add/modify operation in Kolab driver
    
    Signed-off-by: Jan Schneider <jan at horde.org>
    Bug: 13269

 mnemo/lib/Driver/Kolab.php |   21 ++++++++++++++-------
 1 files changed, 14 insertions(+), 7 deletions(-)

http://github.com/horde/horde/commit/7dfcba30293aaed2b4afa5ba1ac29b0fdf3d373b