[commits] Horde branch master updated. 4d5a564c882e0ea08df2632fb2a4b393f8250652

[Jan Schneider]

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

from: 757acf3bc70c9882fa509f09c2304ab670af7639

4d5a564 [jan] Fix displayed CalDAV URLs for shared calendars in basic view too (piper at hrz.uni-marburg.de, Bug #12380).

Summary: http://github.com/horde/horde/compare/757acf3bc70c9882fa509f09c2304ab670af7639...4d5a564c882e0ea08df2632fb2a4b393f8250652

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

commit 4d5a564c882e0ea08df2632fb2a4b393f8250652
Author: Jan Schneider <jan at horde.org>
Date:   Mon Aug 11 13:01:49 2014 +0200

    [jan] Fix displayed CalDAV URLs for shared calendars in basic view too (piper at hrz.uni-marburg.de, Bug #12380).
    
    Conflicts:
    	kronolith/docs/CHANGES
    	kronolith/package.xml

 kronolith/lib/Form/EditCalendar.php |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

http://github.com/horde/horde/commit/4d5a564c882e0ea08df2632fb2a4b393f8250652