From: Andy Scherzinger Date: Wed, 14 Oct 2015 08:32:16 +0000 (+0200) Subject: Merge branch 'master' of https://github.com/owncloud/android into material_fab X-Git-Tag: beta-20151202~3^2~29 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/13bef89333593e198dd04db9344898683d8652d8?ds=inline;hp=--cc Merge branch 'master' of https://github.com/owncloud/android into material_fab --- 13bef89333593e198dd04db9344898683d8652d8