* commit '5ee46844':
  ZP-830 Combined; minor formatting fixes. Released under the Affero GNU General Public License (AGPL) version 3.

* commit 'dd66bfdb':
  ZP-831 Combined - typo variable name. Released under the Affero GNU General Public License (AGPL) version 3.

ZP-831 Combined - typo variable name. Released under the Affero GNU General Public License (AGPL) version 3.

ZP-830 Combined; minor formatting fixes. Released under the Affero GNU General Public License (AGPL) version 3.

Merge pull request #140 in ZP/z-push from bugfix/ZP-826-ping-triggers-hierarchy-sync-when to develop

* commit '49773be6':
  ZP-826 Force synchronization of folder if there is an unknown error on exporter setup.

exporter setup.

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

Merge pull request #138 in ZP/z-push from bugfix/ZP-824-foldersync-should-cause-ping-to-force to develop

* commit 'd8718bdc':
  ZP-824 Remove local $sc as it is not needed.
  ZP-824 Invalidate all pingable flags on folders when doing a FolderSync (with changes) or FolderChange (Create, Update, Delete) operation.

Merge pull request #139 in ZP/z-push from bugfix/ZP-825-composer-replacenullchar-filter-can to develop

* commit '9c478cd5':
  ZP-825 Rename ReplaceNullCharFilter classname, register filter in WBXMLEncoder before it is being used.

Merge pull request #137 in ZP/z-push from feature/ZP-705-implement-support-for-streamer_type_stream_asplain to develop

* commit '4ccfc1f5':
  ZP-707 Remove debug.
  ZP-707 use MAPIStreamWrapper where possible.
  ZP-708 Wrap the plaintext body, html body or mime message into a StringStreamWrapper. While the wrapper correctly truncates (UTF-8 compatible), we can also truncate before loading the data in.
  ZP-707 Undo changes to the stream wrappers to be able to write at the beginning of the stream introduced with f133d268.
  ZP-706 SYNC_RESOLVERECIPIENTS_DATA is a base64 stream.
  ZP-706 Fix develop merge wrong conflict resolution.
  ZP-706 SyncMail->mimedata is a plaintext stream.
  ZP-707 Undo config changes.
  ZP-707 The stream wrapper need to truncate UTF-8 compatible.
  ZP-707 Use a MapiStreamWrapper for the AS2.5 mime message.
  ZP-707 When truncating AS12+ the general truncation size for the AS2.5 body should not be considered.
  ZP-707 Fixed instance variable access in MapiStreamWrapper.
  ZP-707 Use plain streams in mapi provider. Added writing functionality to StringStreamWrapper and MapiStreamWrapper. Reading data is encapsulated into a StringStreamWrapper by the Streamer.
  ZP-707 Initial implementation. Needs fixing.
  ZP-706 AirSyncBaseBody data is a plain data stream.

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

WBXMLEncoder before it is being used.

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

(with changes) or FolderChange (Create, Update, Delete) operation.

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

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 #136 in ZP/z-push from bugfix/ZP-823-do-not-sync-suggested-contacts-folder to develop

* commit '403f8afa':
  ZP-823 Remove empty line.
  ZP-823 Do not sync suggested contacts folder.

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

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

StringStreamWrapper. While the wrapper correctly truncates (UTF-8
compatible), we can also truncate before loading the data in.

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

Merge pull request #133 in ZP/z-push from feature/ZP-781-nicer-format-for-memory-usage-and to develop

* commit '673e1981':
  ZP-781 Use comma as decimal and dot as thousand separators, add 's' as unit for time usage.
  ZP-781 Nicer format for memory usage.

Merge pull request #135 in ZP/z-push from bugfix/ZP-817-pr_sensitivity-is-not-saved-for-tasks to develop

* commit '66a7ae5d':
  ZP-817 Set task as private if sensitivity is private or greater.

Merge pull request #134 in ZP/z-push from bugfix/ZP-808-research-and-review-sensitivity-for to develop

* commit 'a973c6ff':
  ZP-808 Set appointment as private if sensitivity is private or greater.

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

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

unit for time usage. 

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 #131 in ZP/z-push from bugfix/ZP-817-pr_sensitivity-is-not-saved-for-tasks to develop

* commit '1dd2d287':
  ZP-817 Unsetting private task in Outlook is not saved on the server.

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

Merge pull request #130 in ZP/z-push from feature/ZP-793-ping-modifies-syncparameters-too-agressively to develop

* commit 'f8d7d6a3':
  ZP-793 Cache requested folderid so only the SyncCollections get changed that really had a change in flags.

that really had a change in flags.

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

Merge pull request #129 in ZP/z-push from bugfix/ZP-817-pr_sensitivity-is-not-saved-for-tasks to develop

* commit 'a333cd79':
  ZP-817 Sensitivity (private) of tasks is not saved on the server.

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

Merge pull request #128 in ZP/z-push from bugfix/ZP-766-outlook-sends-autodiscover-outlook to develop

* commit '289ed5cf':
  ZP-766 Accept outlook response schema on autodiscover, send XML response only for mobile response schema or empty otherwise.

only for mobile response schema or empty otherwise.

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

* commit '392bddc0':
  ZP-802 fix default Settings() responses.

Merge pull request #7 in ZP/z-push from bugfix/ZP-641-filestatemachine-backend-storage-file to develop

* commit 'f087cedd':
  ZP-641 Make sure CleanStates does not touch permanent backend storage files, unless we really want to delete them.
  ZP-641 Revert "For Backend Storage type files, add a user element to the file name so that multiple accounts on the same device do not overwrite each others data in a single file named only for the device."
  For Backend Storage type files, add a user element to the file name so that multiple accounts on the same device do not overwrite each others data in a single file named only for the device.

backend storage files, unless we really want to delete them.

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

ZP-641 Revert "For Backend Storage type files, add a user element to the file name so that multiple accounts on the same device do not overwrite each others data in a single file named only for the device."

This reverts commit 38ce1ca0.

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

* commit 'daf481e5':
  ZP-682 Compare the configured LOGBACKEND lowercase.
  ZP-682 "filelog" and "syslog" classes can not be found by autoloader (because they are in camel case and not lowercase). Rewriting the backend loaded by ZLog to the class name, as this is more end-user friendly. Throwing a FatalNotImplementedException causes a recursion that eats up all available memory before it fails, as that exception tries to log which then throws the exception again.
  ZP-682 updated classmap for CalDav and CardDav backends. Removed includes from the backends.
  ZP-682 Never commit composer binary. Released under the Affero GNU General Public License (AGPL) version 3.
  ZP-682 Composer - AutoInclude. Released under the Affero GNU General Public License (AGPL) version 3.

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