Merge branch 'master' into memcache-public

apps/files/ajax/upload.php

apps/files/js/filelist.js

apps/files/js/files.js

apps/files/templates/part.breadcrumb.php

apps/files/templates/part.list.php

apps/files/triggerupdate.php

apps/files_encryption/appinfo/info.xml

apps/files_encryption/lib/proxy.php

apps/files_encryption/tests/crypt.php

apps/files_encryption/tests/keymanager.php

apps/files_encryption/tests/proxy.php

apps/files_encryption/tests/stream.php

apps/files_encryption/tests/trashbin.php

apps/files_encryption/tests/util.php

apps/files_encryption/tests/webdav.php

apps/files_external/js/dropbox.js

apps/files_external/js/google.js

apps/files_external/js/settings.js

apps/files_external/lib/webdav.php

apps/files_sharing/ajax/publicpreview.php