[commits] Horde branch horde_5_2 updated. c05991bb400160a6ed6b87ac4955af91b2fb55bf

[Michael J. Rubinsky]

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

from: 605768451ad8211cab6ef302f5e0e938056dd60c

bff47ce Fix display of billed hours on graph when overage exists.
f91c6e9 typo
3902b43 Revert this, it's a BC break.
c05991b Merge branch 'master' into horde_5_2

Summary: http://github.com/horde/horde/compare/605768451ad8211cab6ef302f5e0e938056dd60c...c05991bb400160a6ed6b87ac4955af91b2fb55bf

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

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 c05991bb400160a6ed6b87ac4955af91b2fb55bf
Merge: 6057684 3902b43
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sun Nov 10 10:56:12 2013 -0500

    Merge branch 'master' into horde_5_2

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

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