* commit '90319667':
  ZP-1244 use strcasecmp to compare CALDAV_PERSONAL and calendar id
  ZP-1230 Reverted change: Regexp faulty. Details in ticket comment.
  ZP-1230 Reverting change: newlines shouldn't matter in HTML.
  ZP-1230 Reverting change: ob_start() is not required at this point.
  ZP-1230 Reverting change: WBXMLEncoder->getBodypartsCount() is correct.
  ZP-1241 Don't perform heartbeat for empty sync requests.
  ZP-1239 Don't send server side changes if performing incoming actions.
  ZP-1164 Add config option to disable executing fixstates on upgrade.
  ZP-1223 Make sure that the file is a real file and not a special file.
  ZP-1224 Use TimezoneUtil functions to generate timezone string.
  ZP-1230 windows-phone-8.1-unable-to-sync. Released under the Affero GNU General Public License (AGPL) version 3.
  ZP-1230 windows-phone-8.1-unable-to-sync. Released under the Affero GNU General Public License (AGPL) version 3.
  ZP-1230 windows-phone-8.1-unable-to-sync. Released under the Affero GNU General Public License (AGPL) version 3. Fixed as described in Jira.
  ZP-1224 Pass PHP supported timezone to DateTimeZone.