[commits] Horde branch master updated. 70c84047b7fd229a1bb6a1e51ec6985bbe7145e8

[Jan Schneider]

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

from: 094ecdd492e8dd1ea8cf9def35c1d105abcc4ec0

645391b Typo
67ab002 Fix unit tests.
1dada94 Fix typo in Kolab passwd driver
70c8404 Merge branch 'passwd-kolab-typo' of https://github.com/sathieu/horde

Summary: http://github.com/horde/horde/compare/094ecdd492e8dd1ea8cf9def35c1d105abcc4ec0...70c84047b7fd229a1bb6a1e51ec6985bbe7145e8

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

commit 645391bb4e711979734a0e68e9fdde345c6c9785
Author: Jan Schneider <jan at horde.org>
Date:   Tue Apr 28 21:04:44 2015 +0200

    Typo

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

http://github.com/horde/horde/commit/645391bb4e711979734a0e68e9fdde345c6c9785

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

commit 67ab00285ccd19de53488520fd61d43000384c8f
Author: Jan Schneider <jan at horde.org>
Date:   Tue Apr 28 21:54:41 2015 +0200

    Fix unit tests.
    
    Conflicts:
    	kronolith/package.xml

 kronolith/lib/Event/Mock.php                             |   20 ++++++++++++++
 kronolith/lib/Factory/Driver.php                         |    3 +-
 kronolith/package.xml                                    |    6 +++-
 kronolith/test/Kronolith/Integration/ToIcalendarTest.php |    2 +-
 kronolith/test/Kronolith/Stub/Registry.php               |    5 +++
 5 files changed, 32 insertions(+), 4 deletions(-)
 create mode 100644 kronolith/lib/Event/Mock.php

http://github.com/horde/horde/commit/67ab00285ccd19de53488520fd61d43000384c8f

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

commit 1dada942dfd5dfea29eba4814fad445b4d9f5ebf
Author: Mathieu Parent <math.parent at gmail.com>
Date:   Sun May 3 11:33:48 2015 +0200

    Fix typo in Kolab passwd driver
    
    Patch by Mike Gabriel, originally reported at https://bugs.debian.org/780670

 passwd/lib/Driver/Kolab.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

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

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

commit 70c84047b7fd229a1bb6a1e51ec6985bbe7145e8
Merge: 67ab002 1dada94
Author: Jan Schneider <jan at horde.org>
Date:   Mon May 4 14:20:31 2015 +0200

    Merge branch 'passwd-kolab-typo' of https://github.com/sathieu/horde

 passwd/lib/Driver/Kolab.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://github.com/horde/horde/commit/70c84047b7fd229a1bb6a1e51ec6985bbe7145e8