From: Andy Scherzinger Date: Tue, 22 Sep 2015 08:01:14 +0000 (+0200) Subject: Merge branch 'master' of https://github.com/owncloud/android into material_buttons X-Git-Tag: beta-20151128~7^2~21 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/66aede2b3c152924295dff718ca2b5e69dd9961b Merge branch 'master' of https://github.com/owncloud/android into material_buttons --- 66aede2b3c152924295dff718ca2b5e69dd9961b