Merge branch 'develop' into refactor_remote_operation_to_read_file
authormasensio <masensio@solidgear.es>
Mon, 2 Dec 2013 11:40:29 +0000 (12:40 +0100)
committermasensio <masensio@solidgear.es>
Mon, 2 Dec 2013 11:40:29 +0000 (12:40 +0100)
commit39c2fffbfee249150da86f541c08f99db2ad1752
treeb4ac93f41f45969cf01d67ddbaf5d7bea21deafd
parent26f68e0eac0f7770251b9ff4e1cfaa22f57d75cc
parent5c7b534cc54f854bad850f140c980eb5261ec063
Merge branch 'develop' into refactor_remote_operation_to_read_file

Conflicts:
oc_framework/src/com/owncloud/android/oc_framework/operations/RemoteFile.java
oc_framework/src/com/owncloud/android/oc_framework/operations/RemoteOperationResult.java
oc_framework/src/com/owncloud/android/oc_framework/utils/FileUtils.java
src/com/owncloud/android/operations/SynchronizeFolderOperation.java
oc_framework-test-project/oc_framework-test-test/src/com/owncloud/android/oc_framework_test_project/test/ReadFileTest.java
oc_framework/src/com/owncloud/android/oc_framework/operations/RemoteOperationResult.java
oc_framework/src/com/owncloud/android/oc_framework/utils/FileUtils.java
src/com/owncloud/android/operations/SynchronizeFolderOperation.java