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

Merge branch 'develop' into send_file_pr311_with_develop
---

e183acd650b86e3c2f90f2adedffc71499537f64