fixed xsendfile zip generation race condition
merge translations with those from theme
merge translations with those from theme
additional safety checks
Make class properties protected instead of private to allow subclassing
Dont task external storages with creating their own root
move encryption keys to trash bin
restore encryption keys from trash bin (development snapshot)
fixed some problems and broken code
restore fixed
added handling for share-keys
this works only with latest files_encryption branch up from 813641e6e86601cc73da0f00d8430da62e872180
delete and restore of versions and share-keys now works
fix restore of the same file name
fix for infinite loop causing on files_encryption branch when testing "apps/files_encryption/test/crypt.php" on Method testSymmetricStreamEncryptShortFileContent
Add compatibility function for outerHTML
fixing mimetype for "new" ms office formats

right mime types for docx, pptx and xlsx
with the old mimetype I got a warning message from office everytime I opend such a file (it was downloaded as "filename.docx.doc")
[tx-robot] updated from transifex
Merge pull request #3169 from owncloud/fix_infinite_loop_for_file_cache

fix for infinite loop causing on files_encryption branch when testing
Merge pull request #3156 from owncloud/trashbin_for_encryption_keys_against_master

Trashbin for encryption keys now against master
Set storage id for openstack swift backend
Sort priorized languages as defined in the array

Also add russian and arabic to the common languages.