From: Andy Scherzinger Date: Mon, 10 Aug 2015 14:02:02 +0000 (+0200) Subject: Merge branch 'master' of https://github.com/owncloud/android into video_thumbnail X-Git-Tag: beta-20151202~1^2~2^2 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/a1b24dea37013fec794ecee6a6ef2f3fedefc0a3?hp=--cc Merge branch 'master' of https://github.com/owncloud/android into video_thumbnail --- a1b24dea37013fec794ecee6a6ef2f3fedefc0a3