Merge branch 'master' into filesystem

3rdparty/MDB2/Driver/Reverse/oci8.php

3rdparty/MDB2/Driver/oci8.php

AUTHORS

apps/files/ajax/delete.php

apps/files/ajax/newfile.php

apps/files/ajax/upload.php

apps/files/css/files.css

apps/files/js/fileactions.js

apps/files/js/filelist.js

apps/files/js/files.js

apps/files/l10n/ca.php

apps/files/l10n/cs_CZ.php

apps/files/l10n/da.php

apps/files/l10n/de.php

apps/files/l10n/el.php

apps/files/l10n/eo.php

apps/files/l10n/es.php

apps/files/l10n/et_EE.php

apps/files/l10n/eu.php

apps/files/l10n/fr.php