From: masensio <masensio@solidgear.es>
Date: Mon, 17 Feb 2014 08:20:45 +0000 (+0100)
Subject: Merge branch 'develop' into send_file_pr311_with_develop
X-Git-Tag: oc-android-1.5.5~22^2~26
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/de2dd7b1b6004fc39665756d9a0946d6621d59e2

Merge branch 'develop' into send_file_pr311_with_develop
---

de2dd7b1b6004fc39665756d9a0946d6621d59e2