[commits] Horde branch master updated. aabe26ac16b9dc7df7c45665490c68cf6642302c

[Jan Schneider]

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

from: d644d9eabee767d8bda032ebc6e32c0d59fe7a57

0f00ae1 Compare time too when detecting ended events (Bug #13368).
aabe26a [jan] Don't show today's events that are over in portal (Bug #13368).

Summary: http://github.com/horde/horde/compare/d644d9eabee767d8bda032ebc6e32c0d59fe7a57...aabe26ac16b9dc7df7c45665490c68cf6642302c

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

commit 0f00ae119b0d9d1bd60f88ea81877b0eb857cf69
Author: Jan Schneider <jan at horde.org>
Date:   Wed Jul 30 12:25:59 2014 +0200

    Compare time too when detecting ended events (Bug #13368).

 kronolith/lib/Block/Summary.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://github.com/horde/horde/commit/0f00ae119b0d9d1bd60f88ea81877b0eb857cf69

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

commit aabe26ac16b9dc7df7c45665490c68cf6642302c
Author: Jan Schneider <jan at horde.org>
Date:   Wed Jul 30 12:28:10 2014 +0200

    [jan] Don't show today's events that are over in portal (Bug #13368).
    
    Conflicts:
    	kronolith/docs/CHANGES
    	kronolith/package.xml

 kronolith/docs/CHANGES |    2 +-
 kronolith/package.xml  |    1 +
 2 files changed, 2 insertions(+), 1 deletions(-)

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