From: David A. Velasco Date: Thu, 19 Feb 2015 10:01:00 +0000 (+0100) Subject: Merge branch 'master' into develop X-Git-Tag: oc-android-1.7.1_signed^2~48 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/ec6b9d7c70deb50152bfab5cb5f25c9a2dde28e7?ds=inline;hp=--cc Merge branch 'master' into develop --- ec6b9d7c70deb50152bfab5cb5f25c9a2dde28e7