* commit 'f6a273b2':
  ZP-1277 Try to get folder class only for non fake changes.

Released under the Affero GNU General Public License (AGPL) version 3.

Merge pull request #585 in ZP/z-push from bugfix/ZP-1278-caldav-backend-does-not-pick-up-user to develop

* commit 'c6406d4a':
  ZP-1278 Fix caldav backend so the user and (if supplied) domain are picked up for blank organizer fields when sent to mobile. Released under the Affero GNU General Public License (AGPL) version 3.

Merge pull request #539 in ZP/z-push from bugfix/ZP-1226-sent-mails-to-or-cc-field-may-be to develop

* commit '7fe8135b':
  ZP-1226 Sent mails' To or Cc field may be junk string at other mail clients. Released under the Affero GNU General Public License (AGPL) version 3.

Merge pull request #578 in ZP/z-push from bugfix/ZP-1274-carddav-backend-wrong-url-in-debug to develop

* commit 'a3d20eb5':
  ZP-1274 Bugfix carddav backend wrong url in debug. Released under the Affero GNU General Public License (AGPL) version 3.

Merge pull request #584 in ZP/z-push from feature/ZP-1282-store-deleted-occurrences-as-exdate to develop

* commit '35416d42':
  ZP-1282 Store deleted occurrences as EXDATE in caldav. Released under the Affero GNU General Public License (AGPL) version 3.

Merge pull request #576 in ZP/z-push from bugfix/ZP-1269-carddav-backend-newlines-result-in to develop

* commit 'd7d37d76': (185 commits)
  ZP-1269 Bugfix carddav backend support newlines in note field. Released under the Affero GNU General Public License (AGPL) version 3.
  ZP-1269 Bugfix carddav backend support newlines in note field. Released under the Affero GNU General Public License (AGPL) version 3.
  Merge pull request #509 in ZP/z-push from develop to release/2.3
  ZP-250 Release/2.3 should log INFO by default.
  ZP-961 Bumped version.
  ZP-961 Bumped version, updated line endings.
  Merge pull request #290 in ZP/z-push from bugfix/ZP-884-zcp--gethierarchy-is-broken to develop
  Merge pull request #288 in ZP/z-push from bugfix/ZP-971-don-t-fail-when-source-message-id to develop
  Merge pull request #285 in ZP/z-push from feature/ZP-964-pass-z-push-version-in-an-additional to develop
  Merge pull request #283 in ZP/z-push from bugfix/ZP-970-printwbxml-use-files to develop
  ZP-961 Bumped version to 2.2.11beta1. Removed newlines.
  Merge pull request #205 in ZP/z-push from bugfix/ZP-881-change-zcp-server-location-for-listfolders to develop
  Merge pull request #244 in ZP/z-push from bugfix/ZP-935-devicedata-is-deleted-when-requesting to develop
  Merge pull request #236 in ZP/z-push from bugfix/ZP-930-z-push-top-doesn-t-work-in-another to develop
  Merge pull request #191 in ZP/z-push from bugfix/ZP-872-ping-doesn-t-catch-all-notifications to develop
  ZP-959 Format time output at the end of the request to match memory usage format.
  ZP-957 Timezone DayOfWeek and week are switched when packing.
  ZP-854 Bumped version to 2.2.10.
  ZP-854 Bumped to 2.2.10 beta1.
  ZP-854 Bumped version. Fixed line endings.
  ...

Merge pull request #579 in ZP/z-push from bugfix/ZP-1275-gal-does-not-work-with-davical-backend to develop

* commit '6dd1282e':
  ZP-1275 Bugfix GAL does not work with DAViCal backend. Released under the Affero GNU General Public License (AGPL) version 3.

Merge pull request #583 in ZP/z-push from bugfix/ZP-1281-not-escaped-when-creating-icalendar to develop

* commit 'fff02881':
  ZP-1281 Fixed ':' not escaped when creating icalendar. Released under the Affero GNU General Public License (AGPL) version 3.

Merge pull request #582 in ZP/z-push from bugfix/ZP-1280-email-from-a-deleted-user-doesn-t to develop

* commit 'e50f844f':
  ZP-1280 Email from a deleted user doesn't show from field.

Merge pull request #575 in ZP/z-push from bugfix/ZP-1262-synchronization-progress-of-z-push-admin to develop

* commit '1574cd07':
  ZP-1262 Make sure HierarchyCache is loaded when printing device details.

ZP-1282 Store deleted occurrences as EXDATE in caldav. Released under the Affero GNU General Public License (AGPL) version 3.

ZP-1281 Fixed ':' not escaped when creating icalendar. Released under the Affero GNU General Public License (AGPL) version 3.

Released under the Affero GNU General Public License (AGPL) version 3.

up for blank organizer fields when sent to mobile. Released under the Affero GNU General Public License (AGPL) version 3.

ZP-1275 Bugfix GAL does not work with DAViCal backend. Released under the Affero GNU General Public License (AGPL) version 3.

ZP-1274 Bugfix carddav backend wrong url in debug. Released under the Affero GNU General Public License (AGPL) version 3.

ZP-1269 Bugfix carddav backend support newlines in note field. Released under the Affero GNU General Public License (AGPL) version 3.

ZP-1269 Bugfix carddav backend support newlines in note field. Released under the Affero GNU General Public License (AGPL) version 3.

Released under the Affero GNU General Public License (AGPL) version 3.

Merge pull request #573 in ZP/z-push from bugfix/ZP-1251-z-push-top-too-much-output-from-ping to develop

* commit 'a053308b':
  ZP-1251 Aggregate Ping announcements about changes.

Released under the Affero GNU General Public License (AGPL) version 3.

Merge pull request #572 in ZP/z-push from bugfix/ZP-1257-removing-a-folder-added-in-additionalfolders to develop

* commit '8a72d5f7':
  ZP-1257 Remove statically configured shared folders from the list sent to ASDevice->SetAdditionalFolderList().

to ASDevice->SetAdditionalFolderList().

Released under the Affero GNU General Public License (AGPL) version 3.

Merge pull request #570 in ZP/z-push from bugfix/ZP-1268-undefined-variable-name-in-z-push-admin to develop

* commit 'f6cc9d92':
  ZP-1268 Undefined variable: name in z-push-admin.

Released under the Affero GNU General Public License (AGPL) version 3.

Merge pull request #566 in ZP/z-push from bugfix/ZP-1259-check-if-sm-data-is-empty-for-sendmail to develop

* commit '2072ec51':
  ZP-1259 Fixed typo in a variable.
  ZP-1259 Check if sm->data is empty for SendMail.

Released under the Affero GNU General Public License (AGPL) version 3.

Released under the Affero GNU General Public License (AGPL) version 3.

Merge pull request #563 in ZP/z-push from bugfix/ZP-1254-wastebasket-not-available-when-removing to develop

* commit 'fc9d98ee':

Merge pull request #562 in ZP/z-push from bugfix/ZP-1240-html-bodies-should-not-be-truncated to develop

* commit '4b293f5e':
  ZP-1240 Also HTML-trucate bodies from IMAP.
  ZP-1240 HTML safe truncate streams containing HTML data.
  ZP-1240 Add HTML safe truncation options to stream wrappers.
  ZP-1240 Add parameter $htmlsafe (default false) to Utils::Utf8_truncate().

Merge pull request #561 in ZP/z-push from bugfix/ZP-1255-send-as-not-working-for-other-companies to develop

* commit '3bd67f6d':
  ZP-1255 Directly use sharedUser if it's an email address. Enables sending in multi-company environments.

folder.

Released under the Affero GNU General Public License (AGPL) version 3.

folder.

Released under the Affero GNU General Public License (AGPL) version 3.

Released under the Affero GNU General Public License (AGPL) version 3.

sending in multi-company environments.

Released under the Affero GNU General Public License (AGPL) version 3.

Merge pull request #560 in ZP/z-push from bugfix/ZP-1256-z-push-admin-a-resync-t-folderid to develop

* commit 'd9b63fdd':
  ZP-1256 Set backend2folderidCache of ASDevice to false, so it can be rebuilt.
  ZP-1256 Rebuild backend2folderidCache of ASDevice if it's not available.
  ZP-1256 Rebuild backend2folderidCache of ASDevice if it's not available.

rebuilt.

Released under the Affero GNU General Public License (AGPL) version 3.

* commit 'e03948fc':
  ZP-1250 Search for X-Push-Sender only in the headers.

This reverts commit 37251f16.

Released under the Affero GNU General Public License (AGPL) version 3.