From: masensio <masensio@solidgear.es>
Date: Mon, 24 Feb 2014 12:02:10 +0000 (+0100)
Subject: Merge branch 'develop' into send_file_pr311_with_develop
X-Git-Tag: oc-android-1.5.5~22^2~17
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/4852ca8dd4578abbd651907aa3065af0dfaf2b4c?hp=-c

Merge branch 'develop' into send_file_pr311_with_develop
---

4852ca8dd4578abbd651907aa3065af0dfaf2b4c