Merge branch 'master' into memcache-public

.htaccess

3rdparty

apps/files/download.php

apps/files/l10n/et_EE.php

apps/files/l10n/ur.php

apps/files_encryption/l10n/id.php

apps/files_external/appinfo/app.php

apps/files_external/lib/config.php

apps/files_external/lib/owncloud.php

apps/files_external/lib/webdav.php

apps/files_external/tests/config.php

apps/files_external/tests/owncloud.php

apps/files_sharing/l10n/el.php

apps/files_sharing/l10n/id.php

apps/files_trashbin/download.php

apps/files_trashbin/l10n/el.php

apps/files_versions/download.php

apps/files_versions/l10n/el.php

apps/user_ldap/l10n/ur.php

apps/user_ldap/lib/access.php