fix merge conflicts

diff --cc apps/calendar/ajax/events.php
index 887cf8b20728ef890d836fe13bfe3eaa9c9eba07,c62f93c540eb484253ec39c5e564b72e0fb9a4a3..196b2c3394fa7be32daa6b8624d51d47a8de8200
--- 1/apps/calendar/ajax/events.php
--- 2/apps/calendar/ajax/events.php
+++ b/apps/calendar/ajax/events.php
@@@ -7,7 -7,24 +7,7 @@@
   */
  
  require_once ('../../../lib/base.php');
- require_once('../../../3rdparty/when/When.php');
+ require_once('when/When.php');
 -$l = new OC_L10N('calendar');
 -$unnamed = $l->t('unnamed');
 -function create_return_event($event, $vevent){
 -      $return_event = array();
 -      global $unnamed;
 -      $return_event['id'] = (int)$event['id'];
 -      $return_event['title'] = htmlspecialchars(($event['summary']!=NULL || $event['summary'] != '')?$event['summary']: $unnamed);
 -      $return_event['description'] = isset($vevent->DESCRIPTION)?htmlspecialchars($vevent->DESCRIPTION->value):'';
 -      $last_modified = $vevent->__get('LAST-MODIFIED');
 -      if ($last_modified){
 -              $lastmodified = $last_modified->getDateTime()->format('U');
 -      }else{
 -              $lastmodified = 0;
 -      }
 -      $return_event['lastmodified'] = (int)$lastmodified;
 -      return $return_event;
 -}
  
  OC_JSON::checkLoggedIn();
  OC_JSON::checkAppEnabled('calendar');

diff --cc apps/calendar/lib/app.php
index 516c04f038a3d8c864b851ed63118d38bdd11aba,6e92cf67c5c6121918c3bfaad678b1c32bc0c692..f50c65ab4f7f7dd4a41f1a29407edc8feeed96ee
--- 1/apps/calendar/lib/app.php
--- 2/apps/calendar/lib/app.php
+++ b/apps/calendar/lib/app.php
@@@ -114,19 -114,4 +114,19 @@@ class OC_Calendar_App
        public static function getWeekofMonth(){
                return OC_Calendar_Object::getWeekofMonth(self::$l10n);
        }
-               $return_event['title'] = htmlspecialchars($event['summary']);
 +      
 +      public static function prepareForOutput($event, $vevent){
 +              $return_event = array();
 +              $return_event['id'] = (int)$event['id'];
++              $return_event['title'] = htmlspecialchars(($event['summary']!=NULL || $event['summary'] != '')?$event['summary']: self::$l10n->t('unnamed'));
 +              $return_event['description'] = isset($vevent->DESCRIPTION)?htmlspecialchars($vevent->DESCRIPTION->value):'';
 +              $last_modified = $vevent->__get('LAST-MODIFIED');
 +              if ($last_modified){
 +                      $lastmodified = $last_modified->getDateTime()->format('U');
 +              }else{
 +                      $lastmodified = 0;
 +              }
 +              $return_event['lastmodified'] = (int)$lastmodified;
 +              return $return_event;
 +      }
  }