Conflicts:
	lib/config.php

check php version, the encryption app needs php >= 5.3.3

Add a "Wrong password." message, if the password for the public share was wrong.

revert changes which where introduced by accident during merge https://github.com/owncloud/core/commit/23cc69b816f5df465c7c9d0df5630d00abfaf6d0

Conflicts:

	lib/mail.php

Ocs api fixes

rename can cause mtime change - invalid assert

Show a summary as the last filelist entry

if a part file gets renamed to a real file, that this was the second step of a write operation, hence emit a write signal

add openssl_error_string() output to the owncloud.log

introduce pre-disable-app hook and first usage in files_encryption

Conflicts:
	apps/files_encryption/files/error.php

Merge branch 'encryption_check_php_version' of github.com:owncloud/core into encryption_check_php_version

Fix #993

for the public share was wrong.

Fix #2725

some phpdoc added

in case $_SERVER['HTTP_HOST']) is not set let's return localhost - bette...

use executeAudited, add table name to assert message, skip schema changi...

remove unnecessary try catch blocks

Fix upload regressions

missing .