Merge branch 'master' into sdcard-save sd-android-1.7.2
authorPeter Henn <Peter.Henn@web.de>
Wed, 8 Jul 2015 00:47:05 +0000 (00:47 +0000)
committerPeter Henn <Peter.Henn@web.de>
Wed, 8 Jul 2015 00:47:05 +0000 (00:47 +0000)
commit903aef2ba28cd3e4c31eccb89497fd31a7da502b
treede273324c7e3eb14fa7482aa49475b71245273c4
parentbb5f00fcb4a9102cf64aa1282ba4a1db78875708
parent174fa1f36be204e032a7448bade55f4114573f94
Merge branch 'master' into sdcard-save

need to merge especially changes in:
src/com/owncloud/android/utils/FileStorageUtils.java
src/com/owncloud/android/utils/FileStorageUtils.java