From: Andy Scherzinger Date: Tue, 22 Sep 2015 08:01:46 +0000 (+0200) Subject: Merge branch 'master' of https://github.com/owncloud/android into material_fab X-Git-Tag: beta-20151202~3^2~37 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/d3ffaa590b96bd2d0250cf833ea6ebdf4f52d2af Merge branch 'master' of https://github.com/owncloud/android into material_fab --- d3ffaa590b96bd2d0250cf833ea6ebdf4f52d2af