Merge branch 'master' into ocs_api

apps/files/ajax/delete.php

apps/files/js/filelist.js

apps/files_external/l10n/de.php

apps/files_external/l10n/sl.php

apps/files_external/personal.php

apps/files_external/settings.php

apps/files_sharing/public.php

apps/files_versions/history.php

apps/files_versions/templates/history.php

apps/user_ldap/l10n/cs_CZ.php

apps/user_ldap/l10n/de.php

apps/user_ldap/l10n/it.php

apps/user_ldap/l10n/ja_JP.php

apps/user_ldap/l10n/ru.php

apps/user_ldap/l10n/sl.php

apps/user_ldap/lib/access.php

apps/user_ldap/lib/connection.php

apps/user_webdavauth/settings.php

core/l10n/de.php

core/l10n/de_DE.php