From: masensio <masensio@solidgear.es>
Date: Thu, 27 Feb 2014 07:40:17 +0000 (+0100)
Subject: Merge branch 'develop' into send_file_pr311_with_develop
X-Git-Tag: oc-android-1.5.5~22^2~8
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/ac836eddb76f9489d4ed643802f6c89b184a88c3

Merge branch 'develop' into send_file_pr311_with_develop
---

ac836eddb76f9489d4ed643802f6c89b184a88c3