[commits] Horde branch master updated. 9422ef8f18c86220138c07d89738d856f4114da9

[Jan Schneider]

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

from: fcd11ab0cf2add66533baf8b63c784b3de940cc1

9422ef8 [jan] Ignore iCalendar alarms without action, and use first, not last alarm (Bug #12865).

Summary: http://github.com/horde/horde/compare/fcd11ab0cf2add66533baf8b63c784b3de940cc1...9422ef8f18c86220138c07d89738d856f4114da9

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

commit 9422ef8f18c86220138c07d89738d856f4114da9
Author: Jan Schneider <jan at horde.org>
Date:   Wed Nov 27 10:36:35 2013 +0100

    [jan] Ignore iCalendar alarms without action, and use first, not last alarm (Bug #12865).
    
    Conflicts:
    	kronolith/docs/CHANGES
    	kronolith/package.xml

 kronolith/docs/CHANGES  |    2 ++
 kronolith/lib/Event.php |    7 +++++++
 kronolith/package.xml   |    2 ++
 3 files changed, 11 insertions(+), 0 deletions(-)

http://github.com/horde/horde/commit/9422ef8f18c86220138c07d89738d856f4114da9
http://git.horde.org/horde-git/-/commit/9422ef8f18c86220138c07d89738d856f4114da9