Merge branch 'master' into sync_full_folder
authormasensio <masensio@solidgear.es>
Wed, 30 Sep 2015 10:24:01 +0000 (12:24 +0200)
committermasensio <masensio@solidgear.es>
Wed, 30 Sep 2015 10:24:01 +0000 (12:24 +0200)
commit9494620cc4f61450223658e703f16bfa63248522
treed45d4470e154fe9ab8fd5e949787e0d1b256fcb9
parent001801a39b1d0179db4df37e4691364525427080
parent8090269d557590a6d50f184006abef6c9bb7d399
Merge branch 'master' into sync_full_folder

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