[commits] Horde branch master updated. 7d3f60adf6080351805aeb74c40ac34863daf9e5

[Jan Schneider]

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

from: d14869ecd02f8800e63f63a86de6ed27e328ef1b

7d3f60a Catch unknown timezones when importing events (Bug #11688).

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

commit 7d3f60adf6080351805aeb74c40ac34863daf9e5
Author: Jan Schneider <jan at horde.org>
Date:   Mon May 27 21:25:49 2013 +0200

    Catch unknown timezones when importing events (Bug #11688).
    
    Conflicts:
    	kronolith/docs/CHANGES
    	kronolith/package.xml

 kronolith/lib/Event.php |    9 +++++++--
 kronolith/package.xml   |    1 +
 2 files changed, 8 insertions(+), 2 deletions(-)

http://git.horde.org/horde-git/-/commit/7d3f60adf6080351805aeb74c40ac34863daf9e5