From: masensio <masensio@solidgear.es>
Date: Mon, 3 Mar 2014 07:46:26 +0000 (+0100)
Subject: Merge branch 'develop' into send_file_pr311_with_develop
X-Git-Tag: oc-android-1.5.5~22^2~5
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/c492555b1b873922e0b98cae83eed29c8aac6963

Merge branch 'develop' into send_file_pr311_with_develop
---

c492555b1b873922e0b98cae83eed29c8aac6963