From: masensio <masensio@solidgear.es>
Date: Fri, 7 Mar 2014 07:53:24 +0000 (+0100)
Subject: Merge branch 'develop' into send_file_pr311_with_develop
X-Git-Tag: oc-android-1.5.5~22^2~1
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/c86d3cedecfd63e0d6b6c3f5900e022c70f78e74

Merge branch 'develop' into send_file_pr311_with_develop
---

c86d3cedecfd63e0d6b6c3f5900e022c70f78e74