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)
1  2 
src/com/owncloud/android/datamodel/FileDataStorageManager.java