Use the constants from OC_Log
Remove default return hint
Merge pull request #3235 from NCTU-NBA/pr-langcode

Modify zh_* language codes
Merge branch 'master' into update_etags_on_restore
Merge branch 'master' into ldap_configurable_username_n_uuid
Add requesttoken to guest view

Should fix #3321
use preShare hook only to check if all pub keys are available and the postShare hook to finaly update the shareKeys if the file was shared successfully
Merge pull request #3326 from owncloud/fix-3321

Add requesttoken to guest view
generate random key name for share key to avoid name conflicts
if file was shared to user than userIds is just the users Id
peselect filename without extension on rename
Merge pull request #3329 from owncloud/increase_lock_timeout

Set the SQLite database lock timeout to 60 seconds which is the default ...
Merge pull request #3303 from owncloud/update_etags_on_restore

Make sure that etags get updated once a file gets retored from the trash bin
Prevent backgroundScan() from looping if opendir() is failing for the same path
don't create a recovery user, only generate recovery key similar to the public link share key
don't handle public share keys in lib/public/share.php but in apps/files_encryption/lib/util.php instead
Keeping Font Colors Consistant on the headers.
removed var_dump
added handling for public file access via files_sharing link
added post_createUser hook