Merge branch 'develop' into delete_local_files
authormasensio <masensio@solidgear.es>
Wed, 28 Jan 2015 09:37:08 +0000 (10:37 +0100)
committermasensio <masensio@solidgear.es>
Wed, 28 Jan 2015 09:37:08 +0000 (10:37 +0100)
commitd19128e770443fac3e134e46dbb88a3b29070fd3
tree64656def780d950e0f521c1ec3661e80054dcea2
parenta69c04d8e938b67f1a44a72b9148b907ebd7b256
parentbcef91629294807eba3119cf50ceeed5452ebbc7
Merge branch 'develop' into delete_local_files
src/com/owncloud/android/datamodel/FileDataStorageManager.java