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

Fix #993

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

Ie8 compatibility fixes

Conflicts:

	lib/mail.php

lib/defaults.php should only contain the default strings and read the other strings directly from the theme

Conflicts:

	settings/templates/admin.php

enable testing individual tests

if rename of file fails, the rename is undone in the view - fix 2820