Merge pull request #45 in ZP/z-push from bugfix/ZP-689-stateobject.php-use-args-in-sprintf to develop

* commit 'b27439fa':
  ZP-689 Use args in sprintf. Released under the Affero GNU General Public License (AGPL) version 3.

Merge pull request #44 in ZP/z-push from bugfix/ZP-688-devicemanager.php-typo-in-log-line to develop

* commit '671c6f50':
  ZP-688 Typo in log message. Released under the Affero GNU General Public License (AGPL) version 3.

* commit 'b57de6be':
  ZP-683 Fix typo. Released under the Affero GNU General Public License (AGPL) version 3.

* commit 'd4433dc7':
  ZP-681 Remove extra lines at eof. Replace CR+LF. Released under the Affero GNU General Public License (AGPL) version 3.
  ZP-681 Missing ; at eol. Released under the Affero GNU General Public License (AGPL) version 3.
  ZP-681 Remove PHP closing tag. Released under the Affero GNU General Public License (AGPL) version 3.

ZP-681 Remove extra lines at eof. Replace CR+LF. Released under the Affero GNU General Public License (AGPL) version 3.

ZP-681 Remove PHP closing tag. Released under the Affero GNU General Public License (AGPL) version 3.

Merge pull request #33 in ZP/z-push from feature/ZP-671-log-memory-and-time-details-on-end to develop

* commit 'aac92fc7':
  ZP-671 Changes recommended by Manfred. Released under the Affero GNU General Public License (AGPL) version 3.
  ZP-671 Log memory and time info. Released under the Affero GNU General Public License (AGPL) version 3.

* commit '92857db9':
  ZP-560 Remove newline at end of index.php. Released under the Affero GNU General Public License (AGPL) version 3.
  ZP-560 Add URL for original source. Released under the Affero GNU General Public License (AGPL) version 3.
  ZP-560 Add license information. Released under the Affero GNU General Public License (AGPL) version 3.
  ZP-560 Move zsyslog.php to include. Released under the Affero GNU General Public License (AGPL) version 3.
  feat(ZP-560): Add syslog option for logging

Merge branch 'feature/ZP-560-add-syslog-option-for-logging' of https://stash.z-hub.io/scm/zp/z-push into feature/ZP-560-add-syslog-option-for-logging

General Public License (AGPL) version 3.

Merge pull request #34 in ZP/z-push from bugfix/ZP-672-options-without-authentication-info to develop

* commit '0db8a314':
  ZP-672 Always require Authentication header. Released under the Affero GNU General Public License (AGPL) version 3.
  ZP-672 Options without authentication info. Released under the Affero GNU General Public License (AGPL) version 3.

* commit '86eea041':
  ZP-678 Allow to autoload backends. Released under the Affero GNU General Public License (AGPL) version 3. Do not try to include backend, if it can be or is already autoloaded. Allows to place backends outside z-push package.

Merge pull request #35 in ZP/z-push from bugfix/ZP-676-streamer-type-streamer_type_send_empty to develop

* commit 'e6b04fab':
  ZP-676 Removed trailing space. Released under the Affero GNU General Public License (AGPL) version 3.
  ZP-676 Fix to handle incoming STREAMER_TYPE_SEND_EMPTY property type. Released under the Affero GNU General Public License (AGPL) version 3.

Public License (AGPL) version 3.

ZP-671 Changes recommended by Manfred. Released under the Affero GNU General Public License (AGPL) version 3.

ZP-560 Add URL for original source. Released under the Affero GNU General Public License (AGPL) version 3.

GNU General Public License (AGPL) version 3.

Merge pull request #37 in ZP/z-push from bugfix/ZP-674-remove-the-include-of-mimedecode.php to develop

* commit '90d39a88':
  ZP-674 Remove the include of mimeDecode.php in Zarafa backend. Released under the Affero GNU General Public License (AGPL) version 3.

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

ZP-678 Allow to autoload backends. Released under the Affero GNU General Public License (AGPL) version 3. Do not try to include backend, if it can be or is already autoloaded. Allows to place backends outside z-push package.

ZP-676 Fix to handle incoming STREAMER_TYPE_SEND_EMPTY property type. Released under the Affero GNU General Public License (AGPL) version 3.

Merge pull request #32 in ZP/z-push from bugfix/ZP-670-autodiscover-use-http_response_code to develop

* commit 'd4524802':
  ZP-670 Use http_response_code. Released under the Affero GNU General Public License (AGPL) version 3.

Merge pull request #31 in ZP/z-push from feature/ZP-669-compat-add-function-http_response_code to develop

* commit '4c356e5e':
  ZP-669 Add function http_response_code to compat. Released under the Affero GNU General Public License (AGPL) version 3.

Merge pull request #30 in ZP/z-push from feature/ZP-668-mimedecode.php-update-version-and to develop

* commit '59494017':
  ZP-668 Update mimeDecode.php. Released under the Affero GNU General Public License (AGPL) version 3.

Merge pull request #22 in ZP/z-push from feature/ZP-659-backendcombined-add-changessink-methods to develop

* commit '1af618fb':
  ZP-659 Remove else. Released under the Affero GNU General Public License (AGPL) version 3.
  ZP-659 - Add ChangesSink methods. Released under the Affero GNU General Public License (AGPL) version 3.

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

ZP-672 Options without authentication info. Released under the Affero GNU General Public License (AGPL) version 3.

ZP-671 Log memory and time info. Released under the Affero GNU General Public License (AGPL) version 3.

ZP-670 Use http_response_code. Released under the Affero GNU General Public License (AGPL) version 3.

ZP-669 Add function http_response_code to compat. Released under the Affero GNU General Public License (AGPL) version 3.

ZP-668 Update mimeDecode.php. 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-659-backendcombined-add-changessink-methods

Conflicts:
	src/backend/combined/combined.php

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