From: David A. Velasco Date: Fri, 24 Oct 2014 13:24:50 +0000 (+0200) Subject: Merge branch 'master' into develop X-Git-Tag: oc-android-1.7.0_signed~133 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/8d3a956c974661aa1a58f9083ae0af7c3e1a0ca3?ds=inline;hp=--cc Merge branch 'master' into develop --- 8d3a956c974661aa1a58f9083ae0af7c3e1a0ca3