Merge branch 'develop' into fixed_permanent_redirections
Prevent double count of transfer progress when part of an upload is resend
Removed useless log
Merge pull request #267 from owncloud/fixed_permanent_redirections

Fixed permanent redirections
Merge branch 'develop' into refresh_folder_contents_when_browsed_into
Fixed some crashes in refresh of current folder