[commits] Horde branch kronolith_4_2 updated. 7f8ec178751de25984216eaa739db5535f2d4416

[Michael J. Rubinsky]

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

from: ad8d9fa557bbd9bf0b245fe48ab021f9e66493f6

141ce74 Fix mock method signature.
bff47ce Fix display of billed hours on graph when overage exists.
f91c6e9 typo
3902b43 Revert this, it's a BC break.
7f8ec17 Merge branch 'master' into kronolith_4_2

Summary: http://github.com/horde/horde/compare/ad8d9fa557bbd9bf0b245fe48ab021f9e66493f6...7f8ec178751de25984216eaa739db5535f2d4416

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

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 bff47ce675a1bc476897039e1f278e597ec44508
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sun Nov 10 02:22:27 2013 -0500

    Fix display of billed hours on graph when overage exists.

 hermes/js/hermes.js |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://github.com/horde/horde/commit/bff47ce675a1bc476897039e1f278e597ec44508
http://git.horde.org/horde-git/-/commit/bff47ce675a1bc476897039e1f278e597ec44508

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

commit f91c6e9df977f5a6e258ada21d30d0dd472077ba
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sun Nov 10 02:23:23 2013 -0500

    typo

 hermes/js/hermes.js |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://github.com/horde/horde/commit/f91c6e9df977f5a6e258ada21d30d0dd472077ba
http://git.horde.org/horde-git/-/commit/f91c6e9df977f5a6e258ada21d30d0dd472077ba

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

commit 3902b43c2ad06a7a0889f5e1a86a7a434a6fc574
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sun Nov 10 10:54:01 2013 -0500

    Revert this, it's a BC break.

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

http://github.com/horde/horde/commit/3902b43c2ad06a7a0889f5e1a86a7a434a6fc574
http://git.horde.org/horde-git/-/commit/3902b43c2ad06a7a0889f5e1a86a7a434a6fc574

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

commit 7f8ec178751de25984216eaa739db5535f2d4416
Merge: ad8d9fa 3902b43
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sun Nov 10 10:58:50 2013 -0500

    Merge branch 'master' into kronolith_4_2

 framework/ActiveSync/lib/Horde/ActiveSync/Driver/Base.php |    3 +--
 hermes/js/hermes.js                                       |    4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

http://github.com/horde/horde/commit/7f8ec178751de25984216eaa739db5535f2d4416
http://git.horde.org/horde-git/-/commit/7f8ec178751de25984216eaa739db5535f2d4416