From: masensio <masensio@solidgear.es>
Date: Thu, 5 Dec 2013 16:37:40 +0000 (+0100)
Subject: Merge branch 'develop' into refactor_remote_operation_to_download_file
X-Git-Tag: oc-android-1.5.5~100^2~20
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/8214aaeb6dc7f1b6906ac2a134b85cad63bd42be?ds=inline;hp=-c

Merge branch 'develop' into refactor_remote_operation_to_download_file
---

8214aaeb6dc7f1b6906ac2a134b85cad63bd42be