Merge branch 'master' into sabredav_1.6

diff --cc apps/calendar/ajax/events.php
index 6ea556a7abf433b8e232162bc1172975ee2111d9,922df90b76be21b50cf3c0e3912a13d99f1d1a90..dff02e15875901607056b7e9138e1410b2a3d5e8
--- 1/apps/calendar/ajax/events.php
--- 2/apps/calendar/ajax/events.php
+++ b/apps/calendar/ajax/events.php
@@@ -44,10 -59,10 +59,10 @@@ foreach($events as $event)
        $return_event = create_return_event($event, $vevent);
  
        $dtstart = $vevent->DTSTART;
-       $dtend = OC_Calendar_Object::getDTEndFromVEvent($vevent);
        $start_dt = $dtstart->getDateTime();
+       $dtend = OC_Calendar_Object::getDTEndFromVEvent($vevent);
        $end_dt = $dtend->getDateTime();
 -      if ($dtstart->getDateType() == Sabre_VObject_Element_DateTime::DATE){
 +      if ($dtstart->getDateType() == Sabre_VObject_Property_DateTime::DATE){
                $return_event['allDay'] = true;
        }else{
                $return_event['allDay'] = false;

diff --cc apps/calendar/lib/object.php
Simple merge

diff --cc apps/calendar/lib/search.php
Simple merge

diff --cc lib/connector/sabre/directory.php
Simple merge

diff --cc lib/connector/sabre/principal.php
Simple merge