Merge branch 'develop' into refactor_remote_operation_to_read_file
authormasensio <masensio@solidgear.es>
Tue, 7 Jan 2014 09:16:39 +0000 (10:16 +0100)
committermasensio <masensio@solidgear.es>
Tue, 7 Jan 2014 09:16:39 +0000 (10:16 +0100)
commit44e32881688909a310caf7160165502ccb3190a0
tree50a382a8088e7938769b5ad2c25e1174b08b3389
parent772721ab9aa876b62bc4d2c207674adfb46366d5
parent72f6313df8f3afd756a9f6c8bbf9cee4b7d0c8e7
Merge branch 'develop' into refactor_remote_operation_to_read_file

Conflicts:
src/com/owncloud/android/utils/FileStorageUtils.java
src/com/owncloud/android/utils/FileStorageUtils.java