From: Andy Scherzinger Date: Mon, 7 Sep 2015 09:16:29 +0000 (+0200) Subject: Merge branch 'master' of https://github.com/owncloud/android into material_buttons X-Git-Tag: beta-20151128~7^2~34 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/6d670fb6786ade61eea01af32c7ccdbd09992bc9 Merge branch 'master' of https://github.com/owncloud/android into material_buttons --- 6d670fb6786ade61eea01af32c7ccdbd09992bc9