Merge remote-tracking branch 'origin/master' into cancel_in_upload
[pub/Android/ownCloud.git] / src / com / owncloud / android / files / OwnCloudFileObserver.java
2012-08-22 Bartek Przybylskicomplete two way synchronization