From: masensio <masensio@solidgear.es>
Date: Mon, 16 Mar 2015 10:15:27 +0000 (+0100)
Subject: Merge branch 'develop' into create_folder_during_upload_pr_701_with_develop
X-Git-Tag: oc-android-1.7.1_signed^2~9^2~9
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/876204faf03075e286cf550b3bfba86d3f5a1419?hp=876204faf03075e286cf550b3bfba86d3f5a1419

Merge branch 'develop' into create_folder_during_upload_pr_701_with_develop
---