Merge branch 'develop' into refactor_remote_operation_to_upload_file
authormasensio <masensio@solidgear.es>
Mon, 16 Dec 2013 12:26:45 +0000 (13:26 +0100)
committermasensio <masensio@solidgear.es>
Mon, 16 Dec 2013 12:26:45 +0000 (13:26 +0100)
commit8215c5cc96ea095f8a1f1c90e70692e96ef7668f
tree2d052b516081f66953b2dfeb0cf868be2e69cd6a
parente76d4b00ef2c73bbbf17e7f30a0ee93156ce7d1c
parent45c612fdc9f57468be409ebede37ae8c9a7bce33
Merge branch 'develop' into refactor_remote_operation_to_upload_file

Conflicts:
src/com/owncloud/android/files/services/FileUploader.java
oc_framework/src/com/owncloud/android/oc_framework/operations/remote/ChunkedUploadRemoteFileOperation.java
src/com/owncloud/android/files/services/FileUploader.java