From: Andy Scherzinger Date: Mon, 5 Oct 2015 16:51:00 +0000 (+0200) Subject: Merge branch 'master' of https://github.com/owncloud/android into material_fab X-Git-Tag: beta-20151202~3^2~31 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/b40a987519abf85d93108df077d9a54a316ed448?hp=--cc Merge branch 'master' of https://github.com/owncloud/android into material_fab --- b40a987519abf85d93108df077d9a54a316ed448