Merge branch 'master' into disable-mod_pagespeed

3rdparty

apps/files_encryption/l10n/id.php

apps/files_sharing/l10n/id.php

core/l10n/da.php

l10n/da/core.po

l10n/id/core.po

l10n/id/files.po

l10n/id/files_encryption.po

l10n/id/files_sharing.po

l10n/id/files_trashbin.po

l10n/id/settings.po

l10n/id/user_ldap.po

l10n/templates/core.pot

l10n/templates/files.pot

l10n/templates/files_encryption.pot

l10n/templates/files_external.pot

l10n/templates/files_sharing.pot

l10n/templates/files_trashbin.pot

l10n/templates/files_versions.pot

l10n/templates/lib.pot