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.

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.

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

Merge pull request #483 in ZP/z-push from bugfix/ZP-1172-some-mails-bodies-or-headers-in-japanese to develop

* commit 'ae1e82f0':
  ZP-1172 Some mails bodies or headers in Japanese may be decoded in wrong encoding. Released under the Affero GNU General Public License (AGPL) version 3.
  ZP-1172 Some mails bodies or headers in Japanese may be decoded in wrong encoding. Released under the Affero GNU General Public License (AGPL) version 3.
  ZP-1172 Some mails bodies or headers in Japanese may be decoded in wrong encoding. Released under the Affero GNU General Public License (AGPL) version 3.
  ZP-1172 Some mails bodies or headers in Japanese may be decoded in wrong encoding. Released under the Affero GNU General Public License (AGPL) version 3.

Merge pull request #502 in ZP/z-push from bugfix/ZP-1188-check-if-oof-expired-and-disabled to develop

* commit 'f9b61c2a':
  ZP-1188 Check if OOF expired and disabled it if needed.
  ZP-1188 Check if OOF expired and disabled it if needed.

The wiki pages contains extended usage information.

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.

The PHP 2.02 license is not valid for anything other than PHP itself.

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.

ZP-1172 Some mails bodies or headers in Japanese may be decoded in wrong encoding. Released under the Affero GNU General Public License (AGPL) version 3.

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.