From: masensio <masensio@solidgear.es>
Date: Wed, 19 Feb 2014 07:51:58 +0000 (+0100)
Subject: Merge branch 'develop' into send_file_pr311_with_develop
X-Git-Tag: oc-android-1.5.5~22^2~21
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/9343650e8496e6b1c895e448ad91bc9682d3c2f2

Merge branch 'develop' into send_file_pr311_with_develop
---

9343650e8496e6b1c895e448ad91bc9682d3c2f2