Conflicts:
	src/lib/syncobjects/syncappointment.php
	src/lib/syncobjects/syncrecurrence.php

Merge pull request #518 in ZP/z-push from feature/ZP-1197-add-a-flag-to-webservicedevice--getdevicedetails to develop

* commit 'be218d85':
  ZP-1197 rename $noHierarchyCache to $stripHierarchyCache.
  ZP-1197 Make stripping of HierarchyCache from ASDevice optional, expose optional stripping to webservice (default: strip).
  ZP-1197 Implement StripData() for HierarchyCache + MemoryChangesWrapper.

Merge pull request #517 in ZP/z-push from bugfix/ZP-1198-hierarchy-cache-should-strip-data to develop

* commit '19cc91c5':
  ZP-1198 Data stripping needs to be done after all states are loaded.

Merge pull request #512 in ZP/z-push from bugfix/ZP-1177-koe-private-appointments-are-not to develop

* commit '35f54972':
  ZP-1177 Fixed description.
  ZP-1177 Renamed ImportChangesICS->isMessageInSyncInterval() into ImportChangesICS->isModificationAllowed() which also fails if a private object in a shared store is edited. Refactored code into MAPIUtils::IsMessageSharedAndPrivate().
  ZP-1177 Strip private data from objects that support that, else continue to ignore them. SyncObject->StripData() now takes uses a flag decide how to strip.

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

optional stripping to webservice (default: strip).

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 #515 in ZP/z-push from feature/ZP-1195-expose-webservicedevice--getdevicedetails to develop

* commit 'cbdcc5f1':
  ZP-1195 Call Request::GetUser() only once.
  ZP-1195 Expose GetDeviceDetails() via WebserviceDevice.

Merge pull request #514 in ZP/z-push from bugfix/ZP-1163-warning-when-install-z-push-common to develop

* commit 'b2b3fbc5':
  ZP-1195 Use full path.
  ZP-1163 Look only for the file without the relative path.

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 #503 in ZP/z-push from bugfix/ZP-1189-update-license-in-net-socket.php to develop

* commit '509d8abc':
  ZP-1189 Fix license inconsistency in Net/Socket.php
  ZP-1189 Update license in Net Socket

* commit '34eecee2':
  ZP-1168 Always initialize wait time with 0.

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

Merge pull request #506 in ZP/z-push from bugfix/ZP-1190-missing-manpages-for-installed-binaries to develop

* commit 'b6843635':
  ZP-1190 Install manpages in rpm packages
  ZP-1190 Install manpages in debian packages
  ZP-1190 Manpage for z-push-admin
  ZP-1190 Manpage for z-push-gab2contacts
  ZP-1190 Manpage for z-push-gabsync
  ZP-1190 Add links to wiki pages
  ZP-1190 Manpage for z-push-admin
  ZP-1190 Manpage for z-push-top

Merge pull request #501 in ZP/z-push from bugfix/ZP-1187-update-license-in-mail-sendmail.php to develop

* commit '7484cfa5':
  ZP-1187 Mail/sendmail.php: PEAR bug 21082: Use BSD license
  ZP-1187 Mail/sendmail.php: update header

Merge pull request #511 in ZP/z-push from bugfix/ZP-1193-update-license-in-net-smtp.php-to to develop

* commit 'c3bf632a':
  ZP-1193 Update license in Net/SMTP.php to BSD-2-clause

Merge pull request #510 in ZP/z-push from bugfix/ZP-1163-warning-when-install-z-push-common to develop

* commit 'a777322f':
  ZP-1163 Check if config exists before including it.

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

ImportChangesICS->isModificationAllowed() which also fails if a private
object in a shared store is edited. Refactored code into
MAPIUtils::IsMessageSharedAndPrivate().

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

to ignore them. SyncObject->StripData() now takes uses a flag decide how
to strip.

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

Followup to fix incorrect license content, from
https://github.com/pear/Net_Socket/pull/15.

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

Following an upstream license change, see
https://github.com/pear/Net_SMTP/issues/43 .

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 #508 in ZP/z-push from bugfix/ZP-1155-ios-mail-with-z-push-preview-show to develop

* commit 'e2107b9b':
  Revert "Merge pull request #465 in ZP/z-push from bugfix/ZP-1155-ios-mail-with-z-push-preview-show to develop"

Revert "Merge pull request #465 in ZP/z-push from bugfix/ZP-1155-ios-mail-with-z-push-preview-show to develop"

This reverts commit a5ae12e2, reversing
changes made to 3377622e.

Merge pull request #507 in ZP/z-push from bugfix/ZP-1191-z-push-2.3.5-breaks-centos-updates to develop

* commit '852ea354':
  ZP-1191 Fix php-awl package name for rpm based distributions.

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

I haven't been able to test this - please review carefully.

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

This fixes the lintian warnings about missing manpages.

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

Document the wipe action.

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

Written for Debian.

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

Written for Debian.

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

* commit 'aef0c5cd':
  ZP-1168 Make sure waittime is updated when after leaving heartbeat in Sync.

Sync.

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

* commit '44bd25f8':
  ZP-1152 Net/SMTP.php: Update to the PHP 3.01 version of the PHP license
  ZP-1152 Net/SMTP.php: Update preamble