Merge branch 'master' into sharing-api-adding-tests

README.md

apps/dav/lib/connector/sabre/tagsplugin.php

apps/encryption/l10n/el.js

apps/encryption/l10n/el.json

apps/encryption/l10n/oc.js

apps/encryption/l10n/oc.json

apps/encryption/lib/util.php

apps/files/l10n/da.js

apps/files/l10n/da.json

apps/files/l10n/lt_LT.js

apps/files/l10n/lt_LT.json

apps/files_external/l10n/cs_CZ.js

apps/files_external/l10n/cs_CZ.json

apps/files_external/l10n/el.js

apps/files_external/l10n/el.json

apps/files_external/l10n/es.js

apps/files_external/l10n/es.json

apps/files_external/l10n/fi_FI.js

apps/files_external/l10n/fi_FI.json

apps/files_external/l10n/fr.js