fixes for pgsql
changed " to '
reformat code
Merge pull request #3507 from owncloud/remove_unused_vars

remove unused varaibles
Merge pull request #3533 from owncloud/signature-delimiter

fix wrong signature delimiter - fix #3523
Only retrieve the current user's permissions
Implement getDirectoryPermissions() in Shared Permissions, fixes #2846
Merge branch 'master' into file_encryption_external_storage_fixes

Conflicts:
	apps/files_encryption/hooks/hooks.php
fixed problems with file_get_contents and file_put_contents this problem was related to text editor with big text files
fix share and un-share for single file
[tx-robot] updated from transifex
Merge pull request #3529 from owncloud/folder-permissions

Cache: provide a function to get the permissions of all files in a folder with one query
Merge pull request #3509 from owncloud/update_jquery_to_1_10

Update jquery to 1.10.0 and add jquery-migrate 1.2.1
LDAP: fix generation of alternate internal name on conflicts. Use also smaller number for better user experience on e.g. *DAV links
Merge branch 'master' into googledrive
prevent files_versions from calling file proxy which calls files_encryption and do unnecessary load and file operations
added our own file extension .part will not work here if we use file_get_contents so we used our own extension '.etmp'
Clean up hack.
Revert "Clean up hack."

This reverts commit 138c7f615bef9994629d4aa283ae7f037dc0f14d.
Cleanup hacke v.2