From: Andy Scherzinger Date: Mon, 26 Oct 2015 12:57:04 +0000 (+0100) Subject: Merge branch 'master' of https://github.com/owncloud/android into material_buttons X-Git-Tag: beta-20151128~7^2~12 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/2603a351059848dd59b080578a12cd61ca1ed122?hp=--cc Merge branch 'master' of https://github.com/owncloud/android into material_buttons --- 2603a351059848dd59b080578a12cd61ca1ed122