* commit 'a7847061':
  ZP-961 Bumped version.
  ZP-961 Bumped version, updated line endings.
  Merge pull request #290 in ZP/z-push from bugfix/ZP-884-zcp--gethierarchy-is-broken to develop
  Merge pull request #288 in ZP/z-push from bugfix/ZP-971-don-t-fail-when-source-message-id to develop
  Merge pull request #285 in ZP/z-push from feature/ZP-964-pass-z-push-version-in-an-additional to develop
  Merge pull request #283 in ZP/z-push from bugfix/ZP-970-printwbxml-use-files to develop
  ZP-961 Bumped version to 2.2.11beta1. Removed newlines.
  Merge pull request #205 in ZP/z-push from bugfix/ZP-881-change-zcp-server-location-for-listfolders to develop
  Merge pull request #244 in ZP/z-push from bugfix/ZP-935-devicedata-is-deleted-when-requesting to develop
  Merge pull request #236 in ZP/z-push from bugfix/ZP-930-z-push-top-doesn-t-work-in-another to develop
  Merge pull request #191 in ZP/z-push from bugfix/ZP-872-ping-doesn-t-catch-all-notifications to develop
  ZP-959 Format time output at the end of the request to match memory usage format.
  ZP-957 Timezone DayOfWeek and week are switched when packing.

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

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

* commit '98d70540':
  ZP-884 Improve retrieval of hierarchy, also filter search folders.
  ZP-884 Fix GetHierarchy() to provide otherwise streamed properties to MAPIProvider->GetFolder().

Merge pull request #288 in ZP/z-push from bugfix/ZP-971-don-t-fail-when-source-message-id to develop

* commit 'ae2a761c':
  ZP-971 Don't fail when source message id is not found on move operations to the waste basket.

Conflicts:
	src/backend/zarafa/importer.php

Merge pull request #285 in ZP/z-push from feature/ZP-964-pass-z-push-version-in-an-additional to develop

* commit '15724c36':
  ZP-964 Expose Z-Push version via additional header to authenticated users.

* commit 'f0637512':
  ZP-970 Fixed the script to work with WBXML argument. Updated the copyright year.
  ZP-970 Allow call printwbxml from arbitrary directories and use externals files as in usage.

Merge pull request #273 in ZP/z-push from bugfix/ZP-957-timezone-dayofweek-occurrence-are to release/2.2

* commit 'acb959e3':
  ZP-957 Timezone DayOfWeek and week are switched when packing.

Merge pull request #276 in ZP/z-push from bugfix/ZP-959-decimals-in-memory-usage-and-time to release/2.2

* commit '38ce2a9b':
  ZP-959 Format time output at the end of the request to match memory usage format.

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

Merge pull request #205 in ZP/z-push from bugfix/ZP-881-change-zcp-server-location-for-listfolders to develop

* commit '3633fd8e':
  ZP-881 Updated copyright year.
  ZP-881 Define ZCP server location for listfolders depending on ZCP version.

Conflicts:
	src/backend/zarafa/listfolders.php

Merge pull request #244 in ZP/z-push from bugfix/ZP-935-devicedata-is-deleted-when-requesting to develop

* commit '6c16c4a8':
  ZP-935 Check if ASDevice changed before saving it.

Merge pull request #236 in ZP/z-push from bugfix/ZP-930-z-push-top-doesn-t-work-in-another to develop

* commit 'aecb70f2':
  ZP-930 Define include path correctly.

Merge pull request #191 in ZP/z-push from bugfix/ZP-872-ping-doesn-t-catch-all-notifications to develop

* commit '94c04253':
  ZP-872 BackendZarafa->adviseStoreToSink() sometimes advised wrong store.

usage format.

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

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

* commit 'e45b2627':
  ZP-854 Bumped version to 2.2.10.
  ZP-854 Bumped to 2.2.10 beta1.
  ZP-854 Bumped version. Fixed line endings.
  Merge pull request #180 in ZP/z-push from bugfix/ZP-861-user-with-umlauts-in-user-name-is to develop
  Merge pull request #181 in ZP/z-push from feature/ZP-844-support-out-of-office-start-and-end to develop
  Merge pull request #179 in ZP/z-push from feature/ZP-844-support-out-of-office-start-and-end to develop
  ZP-854 Bumped version. Fixed line endings.
  Merge pull request #156 in ZP/z-push from bugfix/ZP-794-use-safeputcontents-to-ensure-atomacy-2 to develop
  Merge pull request #108 in ZP/z-push from feature/ZP-794-safe_put_contents to develop
  Merge pull request #178 in ZP/z-push from bugfix/ZP-860-show-z-push-version-in-autodiscover to develop
  Merge pull request #159 in ZP/z-push from bugfix/ZP-845-improve-utils-fixfileowner to develop
  Merge pull request #177 in ZP/z-push from bugfix/ZP-842-outlook-via-as-does-not-synchronize to develop
  Merge pull request #176 in ZP/z-push from feature/ZP-844-support-out-of-office-start-and-end to develop

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 #180 in ZP/z-push from bugfix/ZP-861-user-with-umlauts-in-user-name-is to develop

* commit 'b29d19cf':
  ZP-861 Move comment.
  ZP-861 User with umlauts in user name is not able to login.

(cherry picked from commit 9995418d)

Merge pull request #181 in ZP/z-push from feature/ZP-844-support-out-of-office-start-and-end to develop

* commit '0738cae2':
  ZP-844 Fix warnings when PR_EC_OUTOFOFFICE_FROM and PR_EC_OUTOFOFFICE_UNTIL are not set. Rename settingsOOFSEt to settingsOofSet and settingsOOFGEt to settingsOofGet.

(cherry picked from commit 12d54f54)

Merge pull request #179 in ZP/z-push from feature/ZP-844-support-out-of-office-start-and-end to develop

* commit '02a91429':
  ZP-844 Delete from and until properties when out of office is not time based.

(cherry picked from commit 6c326890)

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

Merge pull request #156 in ZP/z-push from bugfix/ZP-794-use-safeputcontents-to-ensure-atomacy-2 to develop

* commit 'f34003c0':
  ZP-794 Remove now useless call to FixFileOwner.
  ZP-794 Call FixFileOwner in SafePutContents.

(cherry picked from commit f49acb93)

* commit '50dc9a5c':
  ZP-794 filestatemachine: use Utils::SafePutContents().
  ZP-794 add Utils::SafePutContents().

(cherry picked from commit 6ae18006)

Conflicts:
	src/lib/utils/utils.php

Merge pull request #178 in ZP/z-push from bugfix/ZP-860-show-z-push-version-in-autodiscover to develop

* commit 'ec8c8901':
  ZP-860 Show Z-Push version in autodiscover.

(cherry picked from commit 48b89e2b)

* commit '01358ff4':
  ZP-845 Improve Utils::FixFileOwner.

(cherry picked from commit fc5bc5d3)

Merge pull request #177 in ZP/z-push from bugfix/ZP-842-outlook-via-as-does-not-synchronize to develop

* commit '2b5c898e':
  ZP-842 Check if a folders parent ID is known on the mobile. If not, the folder is ignored and not synchronized to the device.

(cherry picked from commit ff984d6f)

Merge pull request #176 in ZP/z-push from feature/ZP-844-support-out-of-office-start-and-end to develop

* commit '400f2c12':
  ZP-844 Support Out-Of-Office start and end times.

(cherry picked from commit 42f70c87)

Release 2.2.9

* commit '0637fbe9': (27 commits)
  ZP-822 Bumped version.
  ZP-822 Bumped version, fixed line endings.
  Merge pull request #154 in ZP/z-push from bugfix/ZP-840-ping-loop-if-exporter-state-is-not to develop
  Merge pull request #150 in ZP/z-push from bugfix/ZP-641-filestatemachine-backend-storage-file to develop
  Merge pull request #157 in ZP/z-push from bugfix/ZP-645-php-5.4-obstart-needs-an-extra-flag-revert to develop
  ZP-822 Bumped to 2.2.9beta1, fixed line endings.
  Merge pull request #147 in ZP/z-push from bugfix/ZP-833-change-zcp-default-server-location to develop
  Merge pull request #143 in ZP/z-push from bugfix/ZP-830-combined-minor-formatting-fixes to develop
  Merge pull request #144 in ZP/z-push from bugfix/ZP-831-combined-typo-in-variable-name to develop
  ZP-822 Bump to 2.2.9alpha2, fix whitespace.
  Merge pull request #140 in ZP/z-push from bugfix/ZP-826-ping-triggers-hierarchy-sync-when to develop
  ZP-822 Bumped to 2.2.9alpha1. Removed new lines at end of files.
  Merge pull request #133 in ZP/z-push from feature/ZP-781-nicer-format-for-memory-usage-and to develop
  Merge pull request #138 in ZP/z-push from bugfix/ZP-824-foldersync-should-cause-ping-to-force to develop
  Merge pull request #136 in ZP/z-push from bugfix/ZP-823-do-not-sync-suggested-contacts-folder to develop
  Merge pull request #125 in ZP/z-push from bugfix/ZP-815-categories-on-emails-are-not-synchronized-updated to develop
  Merge pull request #109 in ZP/z-push from bugfix/ZP-795-typo-small-fixes to develop
  Merge pull request #134 in ZP/z-push from bugfix/ZP-808-research-and-review-sensitivity-for to develop
  Merge pull request #130 in ZP/z-push from feature/ZP-793-ping-modifies-syncparameters-too-agressively to develop
  Merge pull request #135 in ZP/z-push from bugfix/ZP-817-pr_sensitivity-is-not-saved-for-tasks to develop
  ...

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 #154 in ZP/z-push from bugfix/ZP-840-ping-loop-if-exporter-state-is-not to develop

* commit 'a1541482':
  ZP-840 Rename exception variable.
  ZP-840 Renamed exception variable.
  ZP-840 Catch StateInvalidException when in partial mode.
  ZP-840 Do not throw StateNotFoundException as this messes up Ping. Just treat it as StateInvalid (which is true, FD indicates a state that is not available), do not catch both types in Ping as only StateInvalidException will be thrown.

(cherry picked from commit abf4c77c)

Conflicts:
	src/lib/core/synccollections.php
	src/lib/request/ping.php

Merge pull request #150 in ZP/z-push from bugfix/ZP-641-filestatemachine-backend-storage-file to develop

* commit '5c7a4b19':
  ZP-641 Delete file only if it exists.
  ZP-641 CleanStates() has to stop after deleting one BS file.
  ZP-641 call GetState() with the "do not clean" flag, changed CleanStates() to delete exact bs files when being calles without uuid for bs type (needs better fixing in ZP-835).

(cherry picked from commit 3f1f999e)

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

* commit '749e44a8':
  ZP-645 Revert "PHP 5.4+ ob_start() needs an extra flag to allow".

(cherry picked from commit 52e58756)

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

Merge pull request #147 in ZP/z-push from bugfix/ZP-833-change-zcp-default-server-location to develop

* commit '7d7ebda7':
  ZP-833 Use http socket as default MAPI_SERVER.

(cherry picked from commit 1bd7cd25)

Conflicts:
	src/backend/zarafa/config.php

* commit '5ee46844':
  ZP-830 Combined; minor formatting fixes. Released under the Affero GNU General Public License (AGPL) version 3.

(cherry picked from commit 21fb7d6b)

* commit 'dd66bfdb':
  ZP-831 Combined - typo variable name. Released under the Affero GNU General Public License (AGPL) version 3.

(cherry picked from commit 825880d1)