From: masensio <masensio@solidgear.es>
Date: Wed, 11 Dec 2013 08:38:13 +0000 (+0100)
Subject: Merge branch 'develop' into refactor_remote_operation_to_download_file
X-Git-Tag: oc-android-1.5.5~100^2~15
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/6daaf70be850e630b243591c23ca75ace578702f?hp=-c

Merge branch 'develop' into refactor_remote_operation_to_download_file
---

6daaf70be850e630b243591c23ca75ace578702f