[commits] Horde branch horde_5_2 updated. 605768451ad8211cab6ef302f5e0e938056dd60c

[Michael J. Rubinsky]

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

from: 87bd34f1f8237bffc49b3c7be3f536b60837bb25

141ce74 Fix mock method signature.
6057684 Merge branch 'master' into horde_5_2

Summary: http://github.com/horde/horde/compare/87bd34f1f8237bffc49b3c7be3f536b60837bb25...605768451ad8211cab6ef302f5e0e938056dd60c

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

commit 141ce74b2d005f3c53edc07dfbebd2d2c258ba00
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sun Nov 10 02:12:18 2013 -0500

    Fix mock method signature.

 framework/ActiveSync/lib/Horde/ActiveSync/Driver/Mock.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://github.com/horde/horde/commit/141ce74b2d005f3c53edc07dfbebd2d2c258ba00
http://git.horde.org/horde-git/-/commit/141ce74b2d005f3c53edc07dfbebd2d2c258ba00

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

commit 605768451ad8211cab6ef302f5e0e938056dd60c
Merge: 87bd34f 141ce74
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sun Nov 10 02:12:42 2013 -0500

    Merge branch 'master' into horde_5_2

 framework/ActiveSync/lib/Horde/ActiveSync/Driver/Mock.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://github.com/horde/horde/commit/605768451ad8211cab6ef302f5e0e938056dd60c
http://git.horde.org/horde-git/-/commit/605768451ad8211cab6ef302f5e0e938056dd60c