Changing timings to make test environment-independent
Making UploadInterrupted test fully timing independent
Merge branch 'bugfix-upload-interrupted-test' of https://github.com/pimotte/syncany
Merge branch 'master' of github.com:binwiederhier/syncany
Merge branch 'master' into gui