This fixes a discrepancy in the licensing of the Mail package. In PEAR
bug #15620 the license was changed from PHP 2.02 to the BSD-2-clause,
but somehow the license in sendmail.php wasn't changed. A new bug was
opened for this: PEAR bug #21082. Permission for the license change
was given by the authors in both bug #15620 and #21082.

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

Small part of upstream commit b84fcee: make code php5+ only.
This was committed so the next commit would apply unchanged.

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

Merge pull request #500 in ZP/z-push from bugfix/ZP-1186-folder-created-under-root-in-outlook to develop

* commit '7ade800c':
  ZP-1186 Folder created under root in Outlook is not synced.
  ZP-1186 Folder created under root in Outlook is not synced.
  ZP-1186 Folder created under root in Outlook is not synced.
  ZP-1186 Folder created under root in Outlook is not synced.

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.

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

Merge pull request #498 in ZP/z-push from bugfix/ZP-1169-kopano-mapi_e_unconfigured-0x8004011c to develop

* commit '124d3ae1':
  ZP-1169 KopanoChangesWrapper->hasDiscardDataFlag() is lowercase as it's a private method.
  ZP-1169 Reinitialize ICS exporter if it was used in Ping before on re-usage.

Merge pull request #499 in ZP/z-push from bugfix/ZP-1180-implement-plain-streams-for-caldav to develop

* commit 'a9d432c3':
  ZP-1180 Implement plain streams for CalDav and CardDav backends.

Merge pull request #497 in ZP/z-push from bugfix/ZP-1178-use-pr_search_key-in-cases-the-gab to develop

* commit '3fd1e93f':
  ZP-1178 Use PR_SEARCH_KEY in cases the GAB entry of a recipient is not available.

Merge pull request #495 in ZP/z-push from bugfix/ZP-1182-logauthfail-doesn-t-log-into-z-push-error.log to develop

* commit '159c6ba7':
  ZP-1182 Check all loglevels bitwise.
  ZP-1182 Also log WARN messages into the error log.
  ZP-1182 Remove logging into the error log as messages for the error log file are also written by afterlog().

Merge pull request #496 in ZP/z-push from bugfix/ZP-250-meta-ticket-for-documentation-typo to develop

* commit 'f9e1ffab':
  ZP-250 Don't log logon failes as WARN as the error code is logged already.

* commit '90be45b1':
  ZP-1168 Fixed phpdoc descriptions.
  ZP-1168 Log 'idle' time in INFO level.

Merge pull request #481 in ZP/z-push from bugfix/ZP-1167-some-new-messages-are-outdated-and to develop

* commit '0a87b2a7':
  ZP-1167 Some new messages are outdated and lost when sync. Released under the Affero GNU General Public License (AGPL) version 3.
  ZP-1167 Some new messages are outdated and lost when sync. Released under the Affero GNU General Public License (AGPL) version 3.
  ZP-1167 Some new messages are outdated and lost when sync.  Released under the Affero GNU General Public License (AGPL) version 3.

a private method.

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

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

re-usage.

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

available.

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

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

already.

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

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

file are also written by afterlog().

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 #491 in ZP/z-push from bugfix/ZP-1179-deleting-folders-in-kopano-webapp to develop

* commit '01ae86cf':
  ZP-1179 Folder id need to be converted into short folderids when deleting.

deleting.

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

Merge pull request #488 in ZP/z-push from bugfix/ZP-1175-kopano-listfolders-script-can-not to develop

* commit '38e28798':
  ZP-1175 Kopano listfolders script can not be executed with KC 8.2.0 final.

final.

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

Merge pull request #485 in ZP/z-push from feature/ZP-1174-add-new-shared-folder-flags-for-koe to develop

* commit 'a4fd276f':
  ZP-1174 Rename FLD_FLAGS_REPLYASUSER to FLD_FLAGS_SENDASOWNER to match flag name in KOE, introduced FLD_FLAGS_TRACKSHARENAME (2) and FLD_FLAGS_CALENDARREMINDERS (4).

flag name in KOE, introduced FLD_FLAGS_TRACKSHARENAME (2) and
FLD_FLAGS_CALENDARREMINDERS (4).

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

Merge pull request #484 in ZP/z-push from bugfix/ZP-1173-parentid-missing-in-webservicedevice--additionalfolderlist to develop

* commit '9c3d81fa':
  ZP-1173 Set parentid in response.

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

ZP-1167 Some new messages are outdated and lost when sync. Released under the Affero GNU General Public License (AGPL) version 3.

ZP-1167 Some new messages are outdated and lost when sync. Released under the Affero GNU General Public License (AGPL) version 3.

ZP-1167 Some new messages are outdated and lost when sync.  Released under the Affero GNU General Public License (AGPL) version 3.

Merge pull request #479 in ZP/z-push from bugfix/ZP-1166-gab2contacts-shows-one-empty-contact to develop

* commit '842d464f':
  ZP-1166 Check PR_DISPLAY_TYPE_EX as flag and also ignore DT_ORGANIZATION.

DT_ORGANIZATION.

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

Merge pull request #475 in ZP/z-push from bugfix/ZP-1160-warnings-in-mr-sync-when-user-not to develop

* commit '4015a071':
  ZP-1160 Check if the Representing_ENTRY_ID is set in the properties before accessing it.

Merge pull request #476 in ZP/z-push from feature/ZP-1110-add-config-option-koe_capability_signatures to develop

* commit '4a379455':
  ZP-1110 Add KOE_CAPABILITY_SIGNATURES configuration option (default true).

true).

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