* commit '932566a2':
  ZP-665 New backend LDAP. Released under the Affero GNU General Public License (AGPL) version 3.

Merge pull request #17 in ZP/z-push from feature/ZP-565-add-folderid-to-the-exportchangesdiff--initializeexporter to develop

* commit '3d7b775b':
  ZP-565 Added folderid to the output of found changes. Released under the Affero GNU General Public License (AGPL) version 3.

* commit 'e070d653':
  First check if neither object has the array property set, and if that is the case log it at debug level and continue with the comparison of other properties.

Merge pull request #23 in ZP/z-push from feature/ZP-660-backendcombined-implement-searchprovider to develop

* commit '6a8f86d7':
  ZP-660 Implement SearchProvider. Released under the Affero GNU General Public License (AGPL) version 3.

Merge branch 'develop' of https://stash.z-hub.io/scm/zp/z-push into feature/ZP-660-backendcombined-implement-searchprovider

Conflicts:
	src/backend/combined/combined.php

Merge pull request #24 in ZP/z-push from feature/ZP-661-backendcombined-return-min-as-version to develop

* commit '37b2caa8':
  ZP-661 Return AS supported version. Released under the Affero GNU General Public License (AGPL) version 3.

* commit '5c41dc02':
  ZP-662 Simplify BackendCombined config. Released under the Affero GNU General Public License (AGPL) version 3.

* commit '43dd0a50':
  ZP-663 Lower log level. Released under the Affero GNU General Public License (AGPL) version 3.

Merge branch 'develop' of https://stash.z-hub.io/scm/zp/z-push into bugfix/ZP-663-backendcombined-reduce-log-levels

Conflicts:
	src/backend/combined/combined.php

Merge pull request #27 in ZP/z-push from bugfix/ZP-664-backendcombined-don-t-execute-logoff to develop

* commit '595ae7c5':
  ZP-664 Don't execute Logoff if not needed. Released under the Affero GNU General Public License (AGPL) version 3.

* commit '0f217d9c':
  ZP-666 Updated version z_RFC882. Released under the Affero GNU General Public License (AGPL) version 3.

ZP-666 Updated version z_RFC882. Released under the Affero GNU General Public License (AGPL) version 3.

ZP-664 Don't execute Logoff if not needed. Released under the Affero GNU General Public License (AGPL) version 3.

ZP-662 Simplify BackendCombined config. Released under the Affero GNU General Public License (AGPL) version 3.

ZP-661 Return AS supported version. Released under the Affero GNU General Public License (AGPL) version 3.

ZP-660 Implement SearchProvider. Released under the Affero GNU General Public License (AGPL) version 3.

Merge pull request #21 in ZP/z-push from bugfix/ZP-658-backendcombined-add-emptyfolder-function to develop

* commit 'e83df703':
  ZP-658 Add EmptyFolder function. Released under the Affero GNU General Public License (AGPL) version 3.

Merge pull request #20 in ZP/z-push from bugfix/ZP-657-backendcombined-wrong-parameter-name to develop

* commit 'bbd1fd4d':
  ZP-657 Wrong parameter name. Released under the Affero GNU General Public License (AGPL) version 3.

ZP-658 Add EmptyFolder function. Released under the Affero GNU General Public License (AGPL) version 3.

* commit 'e47a725a':
  ZP-651 Use user agent exposed by DeviceManager (depends on ZP-655). Released under the Affero GNU General Public License (AGPL) version 3.

Merge pull request #18 in ZP/z-push from feature/ZP-655-provide-getter-function-to-retrieve to develop

* commit '4c50ac89':
  ZP-655 Added GetUserAgent to DeviceManager. Released under the Affero GNU General Public License (AGPL) version 3.

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

Affero GNU General Public License (AGPL) version 3.

Affero GNU General Public License (AGPL) version 3.

* commit 'd15b4438':
  ZP-651 #comment use DeviceType if UserAgent is not available

ZP-652 #comment better diffstate performance

* commit '8cd0a71f':
  - improve performance, by not iterating for each entry through all entries, but initially create an associative array of old entries indexed by their key and then iterating through the new entries once identifying new, modfied or removed entries (this makes a hugh difference eg. for addressbooks with a couple of thousand entries more then a factor of 10) - it drops the requirement that ids need to be in ascending order, new diff code works also if $new contains smaller ids. That happens eg. for us when a users unsubscribs from a mail folder and subscribes again

ZP-639 #comment EqualTo is not correctly set

* commit '5c2a9ff7':
  Fix the issue where the decoder code for Search mistakenly assigns the element SYNC_SEARCH_VALUE for search type SYNC_SEARCH_EQUALTO into the ContentParameters object as SearchValueLess instead of SearchValueEqualTo

Merge pull request #8 in ZP/z-push from feature/ZP-642-improve-getstate-debug-messages-for to develop

ZP-642 #comment log bytes read from file to log message

* commit 'f11dc946':
  Separate the calls to unserialize() and file_get_contents() so that the size of the file contents can be logged in the debug message.

Merge pull request #9 in ZP/z-push from bugfix/ZP-643-autodiscover-missing-variable-in-log to develop

* commit '4b2a18d7':
  fix(ZP-643): Missing variable in Log sprintf block

Merge pull request #11 in ZP/z-push from bugfix/ZP-645-php-5.4-obstart-needs-an-extra-flag to develop

* commit '074cc4b9':
  fix(ZP-645): PHP 5.4+ ob_start() needs an extra flag to allow truncate.

* commit '6ed7292c':
  fix(ZP-646): BackendSearchLDAP uses bad range limit

Merge pull request #14 in ZP/z-push from bugfix/ZP-647-backendcombined-sendmail-source--folderid to develop

* commit 'bfc4c616':
  fix(ZP-647): BackendCombined: SendMail source->folderid

We need to remove the backend prefix before calling the final
method.
Signed-off-by: Francisco Miguel Biete &lt;fbiete@gmail.com&gt; <fmbiete@gmail.com>

We have to use the calculated maximum value, that it's not the
number of matches found.
Signed-off-by: Francisco Miguel Biete &lt;fbiete@gmail.com&gt; <fmbiete@gmail.com>

truncate.

We need to set flags before calling ob_end_flush, ob_clean...
Signed-off-by: Francisco Miguel Biete &lt;fbiete@gmail.com&gt; <fmbiete@gmail.com>

Signed-off-by: Francisco Miguel Biete &lt;fbiete@gmail.com&gt; <fmbiete@gmail.com>