From: masensio Date: Fri, 21 Feb 2014 08:22:32 +0000 (+0100) Subject: Merge branch 'develop' into send_file_pr311_with_develop X-Git-Tag: oc-android-1.5.5~22^2~18 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/4172b5824f9a3b58170fd12c2edc609aa3920f7d?hp=--cc Merge branch 'develop' into send_file_pr311_with_develop --- 4172b5824f9a3b58170fd12c2edc609aa3920f7d